Index: head/Mk/Uses/blaslapack.mk =================================================================== --- head/Mk/Uses/blaslapack.mk (revision 523748) +++ head/Mk/Uses/blaslapack.mk (revision 523749) @@ -1,52 +1,52 @@ # $FreeBSD$ # # Handle dependencies on Blas / Lapack # # Feature: blaslapack # Usage: USES=blaslapack or USES=blaslapack:ARGS # Valid ARGS: atlas gotoblas netlib (default) openblas # # Provides: BLASLIB and LAPACKLIB # # Maintainer: thierry@FreeBSD.org .if !defined(_INCLUDE_USES_BLASLAPACK_MK) _INCLUDE_USES_BLASLAPACK_MK= yes _valid_ARGS= atlas gotoblas netlib openblas _DEFAULT_BLASLAPACK= netlib .if empty(blaslapack_ARGS) blaslapack_ARGS= ${_DEFAULT_BLASLAPACK} .endif LDFLAGS+= -L${LOCALBASE}/lib .if ${blaslapack_ARGS} == atlas LIB_DEPENDS+= libatlas.so:math/atlas _BLASLIB= ptf77blas LAPACKLIB= -lalapack -lptcblas _ATLASLIB= atlas ATLASLIB= -l${_ATLASLIB} .elif ${blaslapack_ARGS} == gotoblas LIB_DEPENDS+= libgoto2.so:math/gotoblas LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= goto2p LAPACKLIB= -lgoto2p .elif ${blaslapack_ARGS} == netlib LIB_DEPENDS+= libblas.so:math/blas LIB_DEPENDS+= liblapack.so:math/lapack _BLASLIB= blas LAPACKLIB= -llapack .elif ${blaslapack_ARGS} == openblas LIB_DEPENDS+= libopenblas.so:math/openblas -_BLASLIB= openblasp -LAPACKLIB= -lopenblasp +_BLASLIB= openblas +LAPACKLIB= -lopenblas .else IGNORE= USES=blaslapack: invalid arguments: ${blaslapack_ARGS} .endif BLASLIB= -l${_BLASLIB} .endif Index: head/biology/gemma/Makefile =================================================================== --- head/biology/gemma/Makefile (revision 523748) +++ head/biology/gemma/Makefile (revision 523749) @@ -1,39 +1,39 @@ # $FreeBSD$ PORTNAME= gemma DISTVERSION= 0.98.1 PORTREVISION= 3 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org COMMENT= Genome-wide Efficient Mixed Model Association LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgsl.so:math/gsl USES= blaslapack:openblas compiler:c++11-lang eigen:3 gmake \ localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= genetics-statistics GH_PROJECT= GEMMA MAKEFILE= ${FILESDIR}/Makefile # Assuming openblas is built with pthreads, not openmp CXXFLAGS+= -I${LOCALBASE}/include/eigen3 -DOPENBLAS -pthread -LDFLAGS+= -lopenblasp -pthread +LDFLAGS+= -lopenblas -pthread OPTIONS_DEFINE= EXAMPLES pre-configure: @${REINPLACE_CMD} -e 's|../bin/gemma|../gemma|' ${WRKSRC}/test/*.sh do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) do-test: (cd ${WRKSRC}/test && ${SH} test_suite.sh) .include Index: head/games/leela-zero/Makefile =================================================================== --- head/games/leela-zero/Makefile (revision 523748) +++ head/games/leela-zero/Makefile (revision 523749) @@ -1,36 +1,35 @@ # $FreeBSD$ PORTNAME= leela-zero DISTVERSIONPREFIX= v DISTVERSION= 0.17 PORTREVISION= 5 CATEGORIES= games MAINTAINER= yuri@FreeBSD.org COMMENT= Go engine without human-provided knowledge based on AlphaGo Zero paper LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cblas>0:math/cblas \ - opencl>0:devel/opencl +BUILD_DEPENDS= opencl>0:devel/opencl LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libopenblas.so:math/openblas \ libOpenCL.so:devel/ocl-icd USES= cmake compiler:c++14-lang eigen:3 localbase qt:5 USE_GITHUB= yes GH_TUPLE= google:googletest:cafa9e5:gtest/gtest USE_QT= core widgets buildtools_build qmake_build CMAKE_ON= USE_BLAS BUILD_TESTING CMAKE_ARGS= -DBLAS_INCLUDE_DIRS:STRING=${LOCALBASE}/include PLIST_FILES= bin/autogtp \ bin/leelaz \ bin/validation do-test: @cd ${WRKSRC} && ${MKDIR} .build && ${CP} ../.build/tests .build && cd .build && ./tests .include Index: head/lang/julia06/Makefile =================================================================== --- head/lang/julia06/Makefile (revision 523748) +++ head/lang/julia06/Makefile (revision 523749) @@ -1,198 +1,198 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 0.6.4 DISTVERSIONSUFFIX= -full PORTREVISION= 6 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 06 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ SOVERSION="${PORTVERSION}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= EXAMPLES DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= ARPACK OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} PORTEXAMPLES= * EXAMPLES_VARS= INSTALL_TARGET+=install-examples GPL_LIBS_DESC= Build with GPL libs: FFTW and SUITESPARSE GPL_LIBS_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_FFTW=1 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes ARPACK_DESC= Build self-shipped private arpack-ng ARPACK_MAKE_ARGS= USE_SYSTEM_ARPACK=0 ARPACK_MAKE_ARGS_OFF= USE_SYSTEM_ARPACK=1 ARPACK_LIB_DEPENDS_OFF= libarpack.so:math/arpack-ng SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.0\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 -OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas +OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${GMAKE} -C ${WRKSRC}/deps extract post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: - echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user - echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user + echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user + echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-EXAMPLES-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/examples/julia ${STAGEDIR}${EXAMPLESDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/examples .include Index: head/lang/julia07/Makefile =================================================================== --- head/lang/julia07/Makefile (revision 523748) +++ head/lang/julia07/Makefile (revision 523749) @@ -1,183 +1,183 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 0.7.0 DISTVERSIONSUFFIX= -full PORTREVISION= 6 CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 07 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ SOVERSION="${PORTVERSION}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.2\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 -OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas +OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${GMAKE} -C ${WRKSRC}/deps extract post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: - echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user - echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user + echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user + echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc .include Index: head/lang/julia10/Makefile =================================================================== --- head/lang/julia10/Makefile (revision 523748) +++ head/lang/julia10/Makefile (revision 523749) @@ -1,188 +1,188 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 1.0.4 PORTREVISION= 1 DISTVERSIONSUFFIX= -full CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 10 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 \ shebangfix USE_LDCONFIG= yes DESCR= ${.CURDIR}/../julia/pkg-descr SHEBANG_GLOB= *.sh WRKSRC= ${WRKDIR}/julia-${PORTVERSION} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.2\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 -OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas +OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${MAKE_CMD} -C ${WRKSRC}/deps extract ${MAKE_CMD} -C ${WRKSRC}/stdlib install post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: - echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user - echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user + echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user + echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc .include Index: head/lang/julia11/Makefile =================================================================== --- head/lang/julia11/Makefile (revision 523748) +++ head/lang/julia11/Makefile (revision 523749) @@ -1,188 +1,188 @@ # Created by: Iblis Lin # $FreeBSD$ PORTNAME= julia PORTVERSION= 1.1.1 PORTREVISION= 1 DISTVERSIONSUFFIX= -full CATEGORIES= lang math MASTER_SITES= https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/ PKGNAMESUFFIX= 11 MAINTAINER= iblis@hs.ntnu.edu.tw COMMENT= Julia Language: A fresh approach to technical computing LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libgit2.so:devel/libgit2 \ libgmp.so:math/gmp \ libmbedtls.so:security/mbedtls \ libmpfr.so:math/mpfr \ libpcre2-8.so:devel/pcre2 \ libssh2.so:security/libssh2 \ libutf8proc.so:textproc/utf8proc EXTRACT_DEPENDS=gmake:devel/gmake BUILD_DEPENDS= patchelf:sysutils/patchelf \ pcre2-config:devel/pcre2 \ cmake:devel/cmake USES= gmake compiler:c++11-lib fortran python:2.7,build perl5 \ shebangfix USE_LDCONFIG= yes DESCR= ${.CURDIR}/../julia/pkg-descr SHEBANG_GLOB= *.sh WRKSRC= ${WRKDIR}/julia-${PORTVERSION} INSTALLDIR= julia/${PORTNAME}${PKGNAMESUFFIX} MANDIRS+= ${PREFIX}/${INSTALLDIR}/man ALL_TARGET= default INSTALL_TARGET= install TEST_TARGET= test PLIST_SUB= VERSION="${PORTVERSION:R}" \ JULIA="${INSTALLDIR}" CXXFLAGS+= -stdlib=libc++ -std=c++11 MAKE_ARGS+= prefix=${PREFIX}/${INSTALLDIR} \ JCXXFLAGS="${CXXFLAGS}" \ FORCE_ASSERTIONS=${FORCE_ASSERTIONS} \ USE_GPL_LIBS=${USE_GPL_LIBS} \ USE_SYSTEM_CURL=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_LAPACK=1 \ USE_SYSTEM_LIBGIT2=1 \ USE_SYSTEM_LIBSSH2=1 \ USE_SYSTEM_LIBUV=0 \ USE_SYSTEM_MBEDTLS=1 \ USE_SYSTEM_MPFR=1 \ USE_SYSTEM_PATCHELF=1 \ USE_SYSTEM_PCRE=1 \ USE_SYSTEM_UTF8PROC=1 \ NO_GIT=1 OPTIONS_DEFINE= DEBUG DOCS GPL_LIBS DESKTOP NATIVE OPTIONS_DEFAULT= OPENLIBM OPTIONS_GROUP= PRIVATE OPTIONS_GROUP_PRIVATE= OPENBLAS OPTIONS_SINGLE= LIBM OPTIONS_SINGLE_LIBM= SYSLIBM OPENLIBM OPTIONS_SUB= yes PRIVATE_DESC= Build self-shipped private depends LIBM_DESC= Math library implementation DEBUG_VARS= FORCE_ASSERTIONS=1 \ ALL_TARGET=all DEBUG_MAKE_ARGS= BUNDLE_DEBUG_LIBS=1 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= html DOCS_VARS= INSTALL_TARGET+=install-docs GPL_LIBS_DESC= Build with GPL lib: SUITESPARSE GPL_LIBS_MAKE_ARGS= USE_SYSTEM_SUITESPARSE=0 GPL_LIBS_VARS= USE_GPL_LIBS=1 DESKTOP_DESC= Install icon, .desktop and appdata files DESKTOP_USES= gnome DESKTOP_VARS= INSTALL_TARGET+=install-desktop \ INSTALLS_ICONS=yes SYSLIBM_DESC= Build with system libm SYSLIBM_MAKE_ARGS= USE_SYSTEM_LIBM=1 OPENLIBM_DESC= Build with OpenLibm (math/openlibm) OPENLIBM_MAKE_ARGS= USE_SYSTEM_OPENLIBM=1 OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm OPENBLAS_DESC= Private OpenBLAS v0.3.3\ (ports tree: v${:!${MAKE} -C ${PORTSDIR}/math/openblas -V PORTVERSION!}) OPENBLAS_MAKE_ARGS= USE_SYSTEM_BLAS=0 OPENBLAS_DYNAMIC_ARCH=1 OPENBLAS_MAKE_ARGS_OFF= USE_SYSTEM_BLAS=1 -OPENBLAS_LIB_DEPENDS_OFF= libopenblasp.so:math/openblas +OPENBLAS_LIB_DEPENDS_OFF= libopenblas.so:math/openblas .include NATIVE_DESC= Build with native CPU JIT tuning .if ${PORT_OPTIONS:MNATIVE} MAKE_ARGS+= JULIA_CPU_TARGET=native .else .if ${ARCH} == "amd64" MAKE_ARGS+= JULIA_CPU_TARGET=x86-64 .elif ${ARCH} == "i386" MAKE_ARGS+= JULIA_CPU_TARGET=pentium4 .else MAKE_ARGS+= JULIA_CPU_TARGET=generic .endif .endif # .if ${PORT_OPTIONS:MNATIVE} # OPENBLAS plist .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "amd64" PLIST_SUB+= OPENBLAS64="64_" .else PLIST_SUB+= OPENBLAS64="" .endif .endif # .if ${PORT_OPTIONS:MOPENBLAS} .if ${ARCH} == "i386" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ui_Makefile .endif post-extract: ${MAKE_CMD} -C ${WRKSRC}/deps extract ${MAKE_CMD} -C ${WRKSRC}/stdlib install post-patch: echo "override TAGGED_RELEASE_BANNER=\"FreeBSD port lang/${PORTNAME}${PKGNAMESUFFIX} build\"" >> ${WRKSRC}/Make.user # unset ARCH for auto-detection # Julia build script uses the name x86_86/x86, which are different from ports framework echo "ARCH=" >> ${WRKSRC}/Make.user post-patch-OPENBLAS-on: ${CP} ${FILESDIR}/extra-patch-openblas-fix-arch.patch ${WRKSRC}/deps/patches/openblas-fix-arch.patch post-patch-OPENBLAS-off: - echo "LIBBLAS= -lopenblasp -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user - echo "LIBBLASNAME=libopenblasp" >> ${WRKSRC}/Make.user + echo "LIBBLAS= -lopenblas -L${LOCALBASE}/lib" >> ${WRKSRC}/Make.user + echo "LIBBLASNAME=libopenblas" >> ${WRKSRC}/Make.user echo 'LIBLAPACK= $$(LIBBLAS)' >> ${WRKSRC}/Make.user echo 'LIBLAPACKNAME= $$(LIBBLASNAME)' >> ${WRKSRC}/Make.user post-configure-OPENBLAS-off: ${CC} ${CFLAGS} -lopenblas ${LDFLAGS} -o ${WRKSRC}/check_openblas \ ${FILESDIR}/check_openblas.c ${WRKSRC}/check_openblas && ( \ echo "USE_BLAS64=1" >> ${WRKSRC}/Make.user \ ) || ( \ echo "USE_BLAS64=0" >> ${WRKSRC}/Make.user \ ) post-install: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/man/man1/julia.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1 # clean up for Pkg3.jl .for file in .codecov.yml .travis.yml appveyor.yml bors.toml .gitignore source-extracted ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/${file} ${RM} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/julia/stdlib/v${PORTVERSION:R}/Pkg/ext/TOML/${file} .endfor post-install-DEBUG-on: ${RLN} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/bin/julia-debug ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-debug post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc/julia ${STAGEDIR}${DOCSDIR} ${RMDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc post-install-DOCS-off: # remove empty dir ${RM} -r ${STAGEDIR}${PREFIX}/${INSTALLDIR}/share/doc .include Index: head/math/armadillo/Makefile =================================================================== --- head/math/armadillo/Makefile (revision 523748) +++ head/math/armadillo/Makefile (revision 523749) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= armadillo PORTVERSION= 9.600.4 PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/arma MAINTAINER= danilo@FreeBSD.org COMMENT= C++ linear algebra library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BROKEN_powerpc64= Does not build LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ - libopenblasp.so:math/openblas \ + libopenblas.so:math/openblas \ libarpack.so:math/arpack-ng \ libhdf5.so:science/hdf5 \ libsuperlu.so:math/superlu \ libsz.so:science/szip USES= blaslapack cmake compiler:c++11-lang pkgconfig tar:xz USE_LDCONFIG= yes CMAKE_ARGS+= -DPKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig/ .include Index: head/math/hmat-oss/Makefile =================================================================== --- head/math/hmat-oss/Makefile (revision 523748) +++ head/math/hmat-oss/Makefile (revision 523749) @@ -1,37 +1,35 @@ # $FreeBSD$ PORTNAME= hmat-oss DISTVERSION= 1.5.0-348 PORTREVISION= 3 DISTVERSIONSUFFIX= -g76beaf3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Hierarchical matrix C/C++ library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md -LIB_DEPENDS= libcblas.so:math/cblas \ - libopenblas.so:math/openblas +LIB_DEPENDS= libopenblas.so:math/openblas USES= cmake compiler:openmp USE_GITHUB= yes GH_ACCOUNT= jeromerobert USE_LDCONFIG= yes CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \ - -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \ - -DCBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libcblas.so + -DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so post-configure: # fix the error in math/openturns: /usr/local/lib/libhmat-oss.so.1: undefined reference to `openblas_set_num_threads(int)' @${REINPLACE_CMD} "s|#define OPENBLAS_DISABLE_THREADS|\/\/&|" ${BUILD_WRKSRC}/config.h # OPENBLAS_DISABLE_THREADS enables openblas_set_num_threads(int) here do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${REINPLACE_CMD} "s|#define OPENBLAS_DISABLE_THREADS|\/\/&|" ${BUILD_WRKSRC}/config.h && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include Index: head/math/octave-forge-ltfat/Makefile =================================================================== --- head/math/octave-forge-ltfat/Makefile (revision 523748) +++ head/math/octave-forge-ltfat/Makefile (revision 523749) @@ -1,37 +1,37 @@ # Created by: Stephen Montgomery-Smith # $FreeBSD$ PORTNAME= octave-forge-ltfat PORTVERSION= 2.3.1 PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LIB_DEPENDS= libfftw3.so:math/fftw3 \ libportaudio.so:audio/portaudio \ - libcblas.so:math/cblas + libopenblas.so:math/openblas # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${OCTAVE_PKGNAME} WRKSRC= ${WRKDIR}/${OCTSRC}/src GNU_CONFIGURE= yes .include "${.CURDIR}/../../Mk/bsd.octave.mk" post-build: ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure ${RM} ${WRKSRC}/../inst/DESCRIPTION ${RM} ${WRKSRC}/../inst/ltfat/DESCRIPTION ${RM} ${WRKSRC}/../inst/ltfat/inst/DESCRIPTION cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include Index: head/math/openblas/Makefile =================================================================== --- head/math/openblas/Makefile (revision 523748) +++ head/math/openblas/Makefile (revision 523749) @@ -1,213 +1,167 @@ # Created by: Eijiro Shibusawa # $FreeBSD$ PORTNAME= openblas -PORTVERSION= 0.2.20 -PORTREVISION= 11 +PORTVERSION= 0.3.7 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= NL/lapack/timing/:lapack_tmg -DISTFILES= large.tgz:lapack_tmg timing.tgz:lapack_tmg +DISTFILES= large.tgz:lapack_tmg \ + timing.tgz:lapack_tmg DIST_SUBDIR= openblas MAINTAINER= phd_kimberlite@yahoo.co.jp COMMENT= Optimized BLAS library based on GotoBLAS2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= fortran gmake perl5 +USES= fortran gmake perl5 pkgconfig +CONFLICTS_INSTALL= cblas lapacke + USE_GITHUB= yes GH_ACCOUNT= xianyi GH_PROJECT= OpenBLAS LARGE_FILE= large.tgz TIMING_FILE= timing.tgz USE_LDCONFIG= yes USE_PERL5= build -OPENBLAS_SUFX= r${PORTVERSION} -OPENBLAS_LIBS= libopenblas libopenblasp OPENBLAS_SVER= 0 -OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} -PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} TEST_TARGET= tests BUILDFLAGS= FCOMMON_OPT=-frecursive MAKE_NB_JOBS=-1 -OPTIONS_DEFINE= INTERFACE64 OPENMP -OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 -OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} -OPTIONS_DEFINE_powerpc64= POWER6 +OPTIONS_DEFINE= INTERFACE64 OPENMP +OPTIONS_DEFINE_i386= AVX AVX2 DYNAMIC_ARCH +OPTIONS_DEFINE_amd64= AVX AVX2 DYNAMIC_ARCH +OPTIONS_DEFINE_powerpc64= POWER8 OPTIONS_EXCLUDE_powerpc64= OPENMP .if defined(BATCH) || defined(PACKAGE_BUILDING) OPTIONS_DEFAULT_i386= DYNAMIC_ARCH OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH .endif DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64 INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures OPENMP_DESC= Use OpenMP for threading AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -POWER6_DESC= Optimize for POWER6, instead of the default PPC970 +POWER8_DESC= Optimize for POWER8, instead of the default PPC970 .include .if ${ARCH} == powerpc64 -USE_GCC= yes -. if ${PORT_OPTIONS:MPOWER6} -TARGET_CPU_ARCH= POWER6 +USE_GCC= yes +. if ${PORT_OPTIONS:MPOWER8} +TARGET_CPU_ARCH= POWER8 .else TARGET_CPU_ARCH= PPC970 . endif .endif .if defined(TARGET_CPU_ARCH) BUILDFLAGS+= TARGET=${TARGET_CPU_ARCH} +MAKE_ENV+= TARGET=${TARGET_CPU_ARCH} .endif -MAXTHREADS?= 64 +MAXTHREADS?= 64 BUILDFLAGS_THREAD+= NUM_THREADS=${MAXTHREADS} USE_THREAD=1 .if ${ARCH:M*64} == "" BUILDFLAGS+= BINARY32=1 .else BUILDFLAGS+= BINARY64=1 .endif .if ! ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) MANUAL_PACKAGE_BUILD= Optimizes for the build machine. .endif .if ${PORT_OPTIONS:MDYNAMIC_ARCH} BUILDFLAGS+= DYNAMIC_ARCH=1 PLIST_SUB+= DYNARCH="" .else PLIST_SUB+= DYNARCH="@comment " .endif .if ${PORT_OPTIONS:MINTERFACE64} BUILDFLAGS+= INTERFACE64=1 .endif +.if ! ${PORT_OPTIONS:MAVX} +BUILDFLAGS+= NO_AVX=1 +.endif + +.if ! ${PORT_OPTIONS:MAVX2} +BUILDFLAGS+= NO_AVX2=1 +.endif + .if ${PORT_OPTIONS:MOPENMP} -USES+= compiler:openmp +USES+= compiler:openmp BUILDFLAGS_THREAD+= USE_OPENMP=1 .else USES+= compiler:c11 .endif -.if ! ${PORT_OPTIONS:MAVX} -BUILDFLAGS+= NO_AVX=1 -.endif +.include -.if ! ${PORT_OPTIONS:MAVX2} -BUILDFLAGS+= NO_AVX2=1 +.if ${PORT_OPTIONS:MOPENMP} +.if ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes .endif +.endif post-extract: cd ${DISTDIR}/${DIST_SUBDIR} ; \ ${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC} - ${MKDIR} ${WRKDIR}/lib -post-patch: - ${REINPLACE_CMD} -e "s+%%FIND%%+${FIND}+" \ - -e "s+%%XARGS%%+${XARGS}+" \ - -e "s+%%REINPLACE_CMD%%+${REINPLACE_CMD}+" \ - ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \ - ${WRKSRC}/Makefile.rule - ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ - ${WRKSRC}/Makefile.rule \ - ${WRKSRC}/Makefile.tail \ - ${WRKSRC}/driver/level3/Makefile \ - ${WRKSRC}/driver/others/Makefile \ - ${WRKSRC}/exports/Makefile \ - ${WRKSRC}/interface/Makefile \ - ${WRKSRC}/kernel/Makefile \ - ${WRKSRC}/kernel/Makefile.L3 \ - ${WRKSRC}/lapack/laswp/Makefile \ - ${WRKSRC}/lapack-netlib/SRC/Makefile \ - ${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \ - ${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \ - ${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile \ - ${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile \ - ${WRKSRC}/reference/Makefile - ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ - -e 's+%%LDFLAGS%%+${LDFLAGS}+' \ - -e 's+%%LOCALBASE%%+${LOCALBASE}+' \ - -e 's+%%FIND%%+${FIND}+' \ - -e 's+%%XARGS%%+${XARGS}+' \ - -e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \ - -e 's+$${CROSS_SUFFIX}+${LOCALBASE}/bin/+' \ - -e '/Clang.*OpenMP/g' \ - ${WRKSRC}/Makefile.system - ${REINPLACE_CMD} \ - -e 's/defined(linux)/(defined(linux) || defined(__FreeBSD__))/g' \ - -e 's/ifdef linux/if defined(linux) || defined(__FreeBSD__)/g' \ - ${WRKSRC}/kernel/power/*.S - post-patch-OPENMP-on: - ${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \ + @${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \ ${WRKSRC}/test/Makefile \ ${WRKSRC}/ctest/Makefile -do-build: - cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \ - ${MAKE_CMD} ${MAKE_ARGS} - ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblas.a - ${CP} ${WRKSRC}/libopenblas-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER} - cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean - cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} ${BUILDFLAGS_THREAD} \ - ${MAKE_CMD} ${MAKE_ARGS} - ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a - ${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER} - BENCHMARK_MAXTHREADS?= ${MAXTHREADS} .if ${PORT_OPTIONS:MOPENMP} -BENCHMARK_THREADS_FLAG= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS} +BENCHMARK_THREADS_FLAG= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS} .else -BENCHMARK_THREADS_FLAG= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS} +BENCHMARK_THREADS_FLAG= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS} .endif benchmark: build cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl cd ${WRKSRC}/benchmark ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \ USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS} -do-install: -.for L in ${OPENBLAS_LIBS} - ${INSTALL_DATA} ${WRKDIR}/lib/${L}.a ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKDIR}/lib/${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib - ${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so -.endfor +post-install: cd ${WRKSRC} && \ ${FIND} . -name 'common*.h' -print | ${XARGS} ${BASENAME} | ${XARGS} -I {} ${MV} {} openblas_{} ${MV} ${WRKSRC}/version.h ${WRKSRC}/openblas_version.h ${MV} ${WRKSRC}/param.h ${WRKSRC}/openblas_param.h ${MV} ${WRKSRC}/cpuid.h ${WRKSRC}/openblas_cpuid.h ${MV} ${WRKSRC}/config.h ${WRKSRC}/openblas_config.h ${REINPLACE_CMD} \ -e 's/"common.h"/"openblas_common.h"/' \ -e 's/"version.h"/"openblas_version.h"/' \ -e 's/"param.h"/"openblas_param.h"/' \ -e 's/"cpuid.h"/"openblas_cpuid.h"/' \ -e 's/"config.h"/"openblas_config.h"/' \ -e 's/"common_/"openblas_common_/' \ ${WRKSRC}/*.h \ ${WRKSRC}/*.c \ ${WRKSRC}/interface/*.c ${MKDIR} ${STAGEDIR}${PREFIX}/include/openblas ${INSTALL_DATA} ${WRKSRC}/openblas_*.h ${STAGEDIR}${PREFIX}/include/openblas ${INSTALL_DATA} ${WRKSRC}/cblas.h ${WRKSRC}/config_last.h ${WRKSRC}/l1param.h ${WRKSRC}/l2param.h ${WRKSRC}/symcopy.h \ ${STAGEDIR}${PREFIX}/include/openblas + ${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.a ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a + ${MV} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}_*-r${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${OPENBLAS_SVER} + ${RM} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so + ${LN} -sf lib${PORTNAME}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so -do-install-DYNAMIC_ARCH-on: - ${INSTALL_DATA} ${WRKSRC}/config_kernel.h ${STAGEDIR}${PREFIX}/include/openblas - -.include +.include Index: head/math/openblas/distinfo =================================================================== --- head/math/openblas/distinfo (revision 523748) +++ head/math/openblas/distinfo (revision 523749) @@ -1,7 +1,7 @@ -TIMESTAMP = 1503123719 +TIMESTAMP = 1571670934 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1 SIZE (openblas/large.tgz) = 2595 SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af SIZE (openblas/timing.tgz) = 1059485 -SHA256 (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 5ef38b15d9c652985774869efd548b8e3e972e1e99475c673b25537ed7bcf394 -SIZE (openblas/xianyi-OpenBLAS-v0.2.20_GH0.tar.gz) = 11637301 +SHA256 (openblas/xianyi-OpenBLAS-v0.3.7_GH0.tar.gz) = bde136122cef3dd6efe2de1c6f65c10955bbb0cc01a520c2342f5287c28f9379 +SIZE (openblas/xianyi-OpenBLAS-v0.3.7_GH0.tar.gz) = 11986592 Index: head/math/openblas/files/patch-cpuid_x86.c =================================================================== --- head/math/openblas/files/patch-cpuid_x86.c (revision 523748) +++ head/math/openblas/files/patch-cpuid_x86.c (nonexistent) @@ -1,18 +0,0 @@ ---- cpuid_x86.c.orig 2017-07-24 04:03:35 UTC -+++ cpuid_x86.c -@@ -1329,6 +1329,7 @@ int get_cpuname(void){ - case 8: - switch (model) { - case 1: -+ case 8: - // AMD Ryzen - if(support_avx()) - #ifndef NO_AVX2 -@@ -1865,6 +1866,7 @@ int get_coretype(void){ - } else if (exfamily == 8) { - switch (model) { - case 1: -+ case 8: - // AMD Ryzen - if(support_avx()) - #ifndef NO_AVX2 Property changes on: head/math/openblas/files/patch-cpuid_x86.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-cpuid_sparc.c =================================================================== --- head/math/openblas/files/patch-cpuid_sparc.c (revision 523748) +++ head/math/openblas/files/patch-cpuid_sparc.c (nonexistent) @@ -1,10 +0,0 @@ ---- cpuid_sparc.c.orig 2015-10-27 20:44:50 UTC -+++ cpuid_sparc.c -@@ -49,6 +49,7 @@ void get_subdirname(void){ - } - - void get_cpuconfig(void){ -+ printf("#define SPARC\n"); - printf("#define V9\n"); - printf("#define DTB_DEFAULT_ENTRIES 32\n"); - } Property changes on: head/math/openblas/files/patch-cpuid_sparc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-driver_others_memory.c =================================================================== --- head/math/openblas/files/patch-driver_others_memory.c (revision 523748) +++ head/math/openblas/files/patch-driver_others_memory.c (nonexistent) @@ -1,13 +0,0 @@ -Passing a priority level to constructor/destructor only works on GCC >= 4.3.0; -improve the upstream check so that the build works with base GCC. ---- driver/others/memory.c.orig 2016-04-12 19:29:19 UTC -+++ driver/others/memory.c -@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF - #if defined(_MSC_VER) && !defined(__clang__) - #define CONSTRUCTOR __cdecl - #define DESTRUCTOR __cdecl --#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) && defined(C_GCC) -+#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3))) - #define CONSTRUCTOR __attribute__ ((constructor)) - #define DESTRUCTOR __attribute__ ((destructor)) - #else Property changes on: head/math/openblas/files/patch-driver_others_memory.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-Makefile =================================================================== --- head/math/openblas/files/patch-Makefile (revision 523748) +++ head/math/openblas/files/patch-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.orig 2015-10-27 20:44:50 UTC -+++ Makefile -@@ -238,7 +238,7 @@ ifndef NOFORTRAN - -@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "override CFLAGS = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -- -@echo "ARCH = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ -@echo "ARCH_ = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc Property changes on: head/math/openblas/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-exports+Makefile =================================================================== --- head/math/openblas/files/patch-exports+Makefile (revision 523748) +++ head/math/openblas/files/patch-exports+Makefile (nonexistent) @@ -1,18 +0,0 @@ ---- exports/Makefile.orig 2015-10-27 20:44:50 UTC -+++ exports/Makefile -@@ -140,6 +140,7 @@ endif - #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or - ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD)) - -+EXTRALIB += -lgfortran - so : ../$(LIBSONAME) - - ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX)) -@@ -151,6 +152,7 @@ else - endif - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ - -Wl,--whole-archive $< -Wl,--no-whole-archive \ -+ -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \ - $(FEXTRALIB) $(EXTRALIB) - $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. - rm -f linktest Property changes on: head/math/openblas/files/patch-exports+Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-common__power.h =================================================================== --- head/math/openblas/files/patch-common__power.h (revision 523748) +++ head/math/openblas/files/patch-common__power.h (nonexistent) @@ -1,38 +0,0 @@ ---- common_power.h.orig 2017-07-24 04:03:35 UTC -+++ common_power.h -@@ -241,7 +241,7 @@ static inline int blas_quickdivide(blasint x, blasint - #define HAVE_PREFETCH - #endif - --#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) -+#if defined(POWER3) || defined(POWER6) || defined(PPCG4) || defined(CELL) || defined(POWER8) || defined(PPC970) - #define DCBT_ARG 0 - #else - #define DCBT_ARG 8 -@@ -499,7 +499,7 @@ static inline int blas_quickdivide(blasint x, blasint - - #if defined(ASSEMBLER) && !defined(NEEDPARAM) - --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - #ifndef __64BIT__ - #define PROLOGUE \ - .section .text;\ -@@ -774,7 +774,7 @@ Lmcount$lazy_ptr: - - #define HALT mfspr r0, 1023 - --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - #if defined(PPC440) || defined(PPC440FP2) - #undef MAX_CPU_NUMBER - #define MAX_CPU_NUMBER 1 -@@ -819,7 +819,7 @@ Lmcount$lazy_ptr: - #define MAP_ANONYMOUS MAP_ANON - #endif - --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - #ifndef __64BIT__ - #define FRAMESLOT(X) (((X) * 4) + 8) - #else Property changes on: head/math/openblas/files/patch-common__power.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-Makefile.system =================================================================== --- head/math/openblas/files/patch-Makefile.system (revision 523748) +++ head/math/openblas/files/patch-Makefile.system (nonexistent) @@ -1,62 +0,0 @@ ---- Makefile.system.orig 2015-10-27 20:44:50 UTC -+++ Makefile.system -@@ -218,6 +218,7 @@ MD5SUM = md5 -r - endif - - ifeq ($(OSNAME), FreeBSD) -+EXTRALIB += -lm %%LDFLAGS%% - MD5SUM = md5 -r - endif - -@@ -889,9 +890,17 @@ SYMBOLSUFFIX = - endif - - ifndef LIBNAMESUFFIX -+ifndef SMP - LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX) - else -+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX) -+endif -+else -+ifndef SMP - LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX) -+else -+LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX) -+endif - endif - - KERNELDIR = $(TOPDIR)/kernel/$(ARCH) -@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX - LIBSUFFIX = a - endif - --ifneq ($(DYNAMIC_ARCH), 1) --ifndef SMP --LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX) --LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX) --else --LIBNAME = $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX) --LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX) --endif --else --ifndef SMP - LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX) - LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX) --else --LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX) --LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX) --endif --endif -- - - LIBDLLNAME = $(LIBPREFIX).dll - LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so) -@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS - endif - - export OSNAME --export ARCH -+export ARCH_ - export CORE - export LIBCORE - export PGCPATH Property changes on: head/math/openblas/files/patch-Makefile.system ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-param.h =================================================================== --- head/math/openblas/files/patch-param.h (revision 523748) +++ head/math/openblas/files/patch-param.h (nonexistent) @@ -1,11 +0,0 @@ ---- param.h.orig 2019-06-28 14:19:50 UTC -+++ param.h -@@ -1877,7 +1877,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI - #define ZGEMM_DEFAULT_UNROLL_M 2 - #define ZGEMM_DEFAULT_UNROLL_N 2 - --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_FREEBSD) - #if L2_SIZE == 1024976 - #define SGEMM_DEFAULT_P 320 - #define DGEMM_DEFAULT_P 256 Property changes on: head/math/openblas/files/patch-param.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-cpuid_ia64.c =================================================================== --- head/math/openblas/files/patch-cpuid_ia64.c (revision 523748) +++ head/math/openblas/files/patch-cpuid_ia64.c (nonexistent) @@ -1,12 +0,0 @@ ---- cpuid_ia64.c.orig 2015-10-27 20:44:50 UTC -+++ cpuid_ia64.c -@@ -38,7 +38,9 @@ - - #include - #include -+#ifdef linux - #include -+#endif - #include "cpuid.h" - - #ifdef __ECC Property changes on: head/math/openblas/files/patch-cpuid_ia64.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-Makefile.rule =================================================================== --- head/math/openblas/files/patch-Makefile.rule (revision 523748) +++ head/math/openblas/files/patch-Makefile.rule (nonexistent) @@ -1,15 +0,0 @@ ---- Makefile.rule.orig 2015-10-27 20:44:50 UTC -+++ Makefile.rule -@@ -19,10 +19,10 @@ VERSION = 0.2.15 - - # C compiler including binary type(32bit / 64bit). Default is gcc. - # Don't use Intel Compiler or PGI, it won't generate right codes as I expect. --# CC = gcc -+CC = %%CC%% - - # Fortran compiler. Default is g77. --# FC = gfortran -+FC = %%FC%% - - # Even you can specify cross compiler. Meanwhile, please set HOSTCC. - Property changes on: head/math/openblas/files/patch-Makefile.rule ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/openblas/files/patch-c_check =================================================================== --- head/math/openblas/files/patch-c_check (revision 523748) +++ head/math/openblas/files/patch-c_check (revision 523749) @@ -1,11 +1,11 @@ ---- c_check.orig 2015-10-27 20:44:50 UTC +--- c_check.orig 2019-04-29 17:22:19 UTC +++ c_check -@@ -235,7 +235,7 @@ open(CONFFILE, "> $config" ) || die "Ca +@@ -320,7 +320,7 @@ open(CONFFILE, "> $config" ) || die "Can't create $co # print $data, "\n"; print MAKEFILE "OSNAME=$os\n"; -print MAKEFILE "ARCH=$architecture\n"; +print MAKEFILE "ARCH_=$architecture\n"; print MAKEFILE "C_COMPILER=$compiler\n"; print MAKEFILE "BINARY32=\n" if $binformat ne bin32; print MAKEFILE "BINARY64=\n" if $binformat ne bin64; Index: head/math/openblas/files/patch-common__arm.h =================================================================== --- head/math/openblas/files/patch-common__arm.h (revision 523748) +++ head/math/openblas/files/patch-common__arm.h (revision 523749) @@ -1,20 +1,20 @@ ---- common_arm.h.orig 2016-09-01 03:58:42 UTC +--- common_arm.h.orig 2018-08-30 22:07:48 UTC +++ common_arm.h -@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint +@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint #endif +/* Translate pre-UAL asm to UAL equivalents */ +#if defined(__clang__) +#define fnmacs vmls.f32 +#define fnmacd vmls.f64 +#define fnmuls vnmul.f32 +#define fnmuld vnmul.f64 +#define fldmias vldmia +#define fstmias vstmia +#define fldmiad vldmia +#define fstmiad vstmia +#endif #ifndef F_INTERFACE #define REALNAME ASMNAME Index: head/math/openblas/files/patch-cpuid__arm64.c =================================================================== --- head/math/openblas/files/patch-cpuid__arm64.c (revision 523748) +++ head/math/openblas/files/patch-cpuid__arm64.c (revision 523749) @@ -1,11 +1,11 @@ ---- cpuid_arm64.c.orig 2016-09-01 03:58:42 UTC +--- cpuid_arm64.c.orig 2019-04-29 17:22:19 UTC +++ cpuid_arm64.c -@@ -132,6 +132,8 @@ int detect(void) +@@ -180,6 +180,8 @@ int detect(void) } +#else + return CPU_ARMV8; #endif return CPU_UNKNOWN; Index: head/math/openblas/files/patch-f_check =================================================================== --- head/math/openblas/files/patch-f_check (revision 523748) +++ head/math/openblas/files/patch-f_check (revision 523749) @@ -1,20 +1,20 @@ ---- f_check.orig 2015-10-27 20:44:50 UTC +--- f_check.orig 2018-12-02 22:41:17 UTC +++ f_check -@@ -261,7 +261,7 @@ if ($link ne "") { +@@ -288,7 +288,7 @@ if ($link ne "") { foreach $flags (@flags) { if ( - ($flags =~ /^\-L/) + ($flags =~ /^\-L\S/) && ($flags !~ /^-LIST:/) && ($flags !~ /^-LANG:/) ) { -@@ -292,7 +292,7 @@ if ($link ne "") { +@@ -317,7 +317,7 @@ if ($link ne "") { } if ( - ($flags =~ /^\-l/) + ($flags =~ /^\-l\S/) && ($flags !~ /gfortranbegin/) && ($flags !~ /frtbegin/) && ($flags !~ /pathfstart/) Index: head/math/openblas/files/patch-interface__ztrmv.c =================================================================== --- head/math/openblas/files/patch-interface__ztrmv.c (revision 523748) +++ head/math/openblas/files/patch-interface__ztrmv.c (revision 523749) @@ -1,11 +1,11 @@ ---- interface/ztrmv.c.orig 2016-09-01 03:58:42 UTC +--- interface/ztrmv.c.orig 2019-04-29 17:22:19 UTC +++ interface/ztrmv.c -@@ -242,7 +242,7 @@ void CNAME(enum CBLAS_ORDER order, enum +@@ -245,7 +245,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Upl else #endif { - buffer_size = ((n - 1) / DTB_ENTRIES) * 2 * DTB_ENTRIES + 32 / sizeof(FLOAT); + buffer_size = (((n - 1) / DTB_ENTRIES) * 2 * DTB_ENTRIES + 32 / sizeof(FLOAT)) + 8; // It seems to be required for some K8 or Barcelona CPU buffer_size += 8; if(incx != 1) Index: head/math/openblas/pkg-plist =================================================================== --- head/math/openblas/pkg-plist (revision 523748) +++ head/math/openblas/pkg-plist (revision 523749) @@ -1,40 +1,52 @@ +include/cblas.h +include/f77blas.h +include/lapacke.h +include/lapacke_config.h +include/lapacke_mangling.h +include/lapacke_utils.h include/openblas/cblas.h +include/openblas/config_last.h +include/openblas/l1param.h +include/openblas/l2param.h include/openblas/openblas_common.h include/openblas/openblas_common_alpha.h include/openblas/openblas_common_arm.h include/openblas/openblas_common_arm64.h include/openblas/openblas_common_c.h include/openblas/openblas_common_d.h include/openblas/openblas_common_ia64.h include/openblas/openblas_common_interface.h include/openblas/openblas_common_lapack.h include/openblas/openblas_common_level1.h include/openblas/openblas_common_level2.h include/openblas/openblas_common_level3.h include/openblas/openblas_common_linux.h include/openblas/openblas_common_macro.h include/openblas/openblas_common_mips.h include/openblas/openblas_common_mips64.h include/openblas/openblas_common_param.h include/openblas/openblas_common_power.h include/openblas/openblas_common_q.h include/openblas/openblas_common_reference.h include/openblas/openblas_common_s.h include/openblas/openblas_common_sparc.h include/openblas/openblas_common_stackalloc.h include/openblas/openblas_common_thread.h include/openblas/openblas_common_x.h include/openblas/openblas_common_x86.h include/openblas/openblas_common_x86_64.h include/openblas/openblas_common_z.h include/openblas/openblas_common_zarch.h include/openblas/openblas_config.h -%%DYNARCH%%include/openblas/config_kernel.h -include/openblas/config_last.h include/openblas/openblas_cpuid.h -include/openblas/l1param.h -include/openblas/l2param.h include/openblas/openblas_config_template.h include/openblas/openblas_param.h -include/openblas/symcopy.h include/openblas/openblas_version.h +include/openblas/symcopy.h +include/openblas_config.h +lib/cmake/openblas/OpenBLASConfig.cmake +lib/cmake/openblas/OpenBLASConfigVersion.cmake +lib/libopenblas.a +lib/libopenblas.so +lib/libopenblas.so.0 +libdata/pkgconfig/openblas.pc Index: head/math/py-numpy/Makefile =================================================================== --- head/math/py-numpy/Makefile (revision 523748) +++ head/math/py-numpy/Makefile (revision 523749) @@ -1,78 +1,78 @@ # Created by: Tony Maher # $FreeBSD$ PORTNAME= numpy PORTVERSION= 1.16.5 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP \ https://docs.scipy.org/doc/${PORTNAME}-${PORTVERSION}/:doc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-ref-${PORTVERSION:R}.1.pdf:doc \ ${PORTNAME}-user-${PORTVERSION:R}.1.pdf:doc EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= python@FreeBSD.org COMMENT= The New Numeric Extension to Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} USES= fortran python zip USE_PYTHON= allflavors autoplist concurrent cython distutils GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so// LDFLAGS+= -shared PYDISTUTILS_BUILDARGS= --fcompiler=gnu95 PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 PORTDOCS= * OPTIONS_DEFINE= DOCS SUITESPARSE OPTIONS_SINGLE= BLASLIB OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS OPTIONS_DEFAULT= OPENBLAS SUITESPARSE SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse ATLAS_USES= blaslapack:atlas ATLAS_VARS= BLASLIBS="ptf77blas, ptcblas" BLASNAME=atlas LAPACKLIBS=alpack LIBRARIES=atlas_libs NETLIB_USES= blaslapack:netlib NETLIB_VARS= BLASLIBS="blas, cblas" BLASNAME=atlas LAPACKLIBS=lapack LIBRARIES=atlas_libs NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas -OPENBLAS_VARS= BLASLIBS="openblasp, gfortran" BLASNAME=openblas LAPACKLIBS="openblasp, gfortran" LIBRARIES=libraries +OPENBLAS_VARS= BLASLIBS="openblas, gfortran" BLASNAME=openblas LAPACKLIBS="openblas, gfortran" LIBRARIES=libraries SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse post-extract: @${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp post-patch: @${REINPLACE_CMD} -e 's|%%FC%%|${FC}|' ${WRKSRC}/numpy/distutils/fcompiler/gnu.py @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg post-patch-SUITESPARSE-off: @${REINPLACE_CMD} -e 's|:%%LOCALBASE%%/include/suitesparse||' ${WRKSRC}/site.cfg pre-configure: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%BLASLIBS%%|${BLASLIBS}|; s|%%BLASNAME%%|${BLASNAME}|' \ -e 's|%%LAPACKLIBS%%|${LAPACKLIBS}|; s|%%LIBRARIES%%|${LIBRARIES}|' \ ${WRKSRC}/site.cfg @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/site.cfg ${WRKSRC}/numpy/distutils/system_info.py post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-ref-${PORTVERSION:R}.1.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-user-${PORTVERSION:R}.1.pdf ${STAGEDIR}${DOCSDIR} do-test: @cd ${WRKSRC} && ${PYTHON_CMD} runtests.py .include Index: head/misc/mxnet/Makefile =================================================================== --- head/misc/mxnet/Makefile (revision 523748) +++ head/misc/mxnet/Makefile (revision 523749) @@ -1,67 +1,66 @@ # $FreeBSD$ PORTNAME= mxnet DISTVERSION= 1.6.0 DISTVERSIONSUFFIX= .rc0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc # machine-learning PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= cbd43cab6eef8362bcb1cc91e59b49045c90444c.patch:-p1 \ 89c180d47b407913f0a9948d6e7f55daa523e7aa.patch:-p1 MAINTAINER= yuri@FreeBSD.org COMMENT= Apache MXNet: Ultra-scalable deep learning framework LICENSE= APACHE20 BUILD_DEPENDS= googletest>0:devel/googletest \ - ${LOCALBASE}/include/cblas.h:math/cblas \ ${LOCALBASE}/include/dnnl.h:math/mkl-dnn LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ liblapack.so:math/lapack \ libomp.so:devel/openmp \ libopenblas.so:math/openblas USES= cmake localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= apache GH_PROJECT= incubator-mxnet GH_TUPLE= apache:incubator-tvm:5d66e7a:tvm/3rdparty/tvm \ dmlc:dlpack:b90e939:dlpack/3rdparty/dlpack USE_LDCONFIG= yes CMAKE_OFF= USE_CUDA USE_CUDNN USE_MKLDNN USE_NCCL ENABLE_CUDA_RTC \ BUILD_CPP_EXAMPLES USE_JEMALLOC USE_MKL_IF_AVAILABLE LDFLAGS+= -pthread -lexecinfo OPTIONS_DEFINE= CPP OPENCV OPTIONS_DEFAULT= CPP OPENCV OPTIONS_SUB= yes CPP_DESC= Install the C++ binding (cpp-package) CPP_CMAKE_BOOL= USE_CPP_PACKAGE CPP_USES= python:build CPP_VARS= BINARY_ALIAS=python=${PYTHON_CMD} OPENCV_CMAKE_BOOL= USE_OPENCV OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ libopencv_videoio.so:graphics/opencv .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_OFF+= USE_SSE .endif post-patch: .for lib in mkldnn.h mkldnn_types.h @${RM} ${WRKSRC}/include/mkldnn/${lib} @${LN} -s ${LOCALBASE}/include/dnnl.h ${WRKSRC}/include/mkldnn/${lib} .endfor post-install-CPP-on: # https://github.com/apache/incubator-mxnet/issues/17080 @cd ${STAGEDIR}${PREFIX} && ${RM} include/mxnet-cpp/.gitignore include/mxnet-cpp/CPPLINT.cfg .include Index: head/science/erkale/Makefile =================================================================== --- head/science/erkale/Makefile (revision 523748) +++ head/science/erkale/Makefile (revision 523749) @@ -1,77 +1,76 @@ # $FreeBSD$ PORTNAME= erkale DISTVERSION= g20200110 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Quantum chemistry program to solve the electronic structure of atoms LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= liberkale_omp.so.0.1.0: undefined reference to `__atomic_compare_exchange' BUILD_DEPENDS= armadillo>0:math/armadillo LIB_DEPENDS= libderiv.so:science/libint \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libint.so:science/libint \ - libopenblas.so:math/openblas \ libsz.so:science/szip \ libxc.so:science/libxc RUN_DEPENDS= ${LOCALBASE}/share/erkale/basis/6-21G.gbs:science/erkale-pseudopotentials FLAVORS= serial parallel FLAVOR?= ${FLAVORS:[1]} serial_PKGNAMESUFFIX= -serial USES= cmake:noninja fortran pkgconfig USE_GITHUB= yes GH_ACCOUNT= susilehtola GH_TAGNAME= 0d0c895b0d9bcbcb523e7d7c3a11f590d18827d2 USE_LDCONFIG= yes TEST_TARGET= test CMAKE_ON= BUILD_SHARED_LIBS CMAKE_ARGS= -DERKALE_SYSTEM_LIBRARY=${DATADIR}/basis PLIST_SUB= SUFFIX="${SUFFIX}" .if ${FLAVOR} == serial CMAKE_OFF= USE_OPENMP .else # parallel CMAKE_ON+= USE_OPENMP SUFFIX= _omp LIB_DEPENDS+= libomp.so:devel/llvm${LLVM_DEFAULT} .endif OPTIONS_SINGLE= LINALG OPTIONS_SINGLE_LINALG= NETLIB OPENBLAS -OPTIONS_DEFAULT= NETLIB +OPTIONS_DEFAULT= OPENBLAS LINALG_DESC= Linear algebra library NETLIB_USES= blaslapack:netlib NETLIB_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=-llapack -DBLAS_LIBRARIES:STRING=-lblas NETLIB_LDFLAGS= ${LOCALBASE}/lib/libcblas.so ${LOCALBASE}/lib/liblapack.so ${LOCALBASE}/lib/libblas.so NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas -OPENBLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblasp -OPENBLAS_BROKEN= hits the number of threads limit: https://github.com/xianyi/OpenBLAS/issues/1882 +OPENBLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=-lopenblas -DBLAS_LIBRARIES:STRING=-lopenblas +OPENBLAS_LIB_DEPENDS= libopenblas.so:math/openblas # use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 # have the same compiler for both serial and parallel flavors so that performance numbers can be compared BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} .if ${FLAVOR} == parallel post-install: @${MV} ${STAGEDIR}${PREFIX}/include/erkale ${STAGEDIR}${PREFIX}/include/erkale${SUFFIX} @${MV} ${STAGEDIR}${PREFIX}/bin/erkale_bastool ${STAGEDIR}${PREFIX}/bin/erkale_bastool${SUFFIX} .endif .include Index: head/science/libcint/files/patch-CMakeLists.txt =================================================================== --- head/science/libcint/files/patch-CMakeLists.txt (revision 523748) +++ head/science/libcint/files/patch-CMakeLists.txt (nonexistent) @@ -1,15 +0,0 @@ ---- CMakeLists.txt.orig 2018-03-26 22:49:26 UTC -+++ CMakeLists.txt -@@ -25,7 +25,11 @@ if(QUADMATH_FOUND) - set(HAVE_QUADMATH_H 1 CACHE INTERNAL "Have QUADMATH") - endif() - --find_package(BLAS REQUIRED) -+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=226959 -+#find_package(BLAS REQUIRED) -+set(BLAS_FOUND ON) -+set(BLAS_LINKER_FLAGS -L${CMAKE_INSTALL_PREFIX}/lib -lopenblas -lopenblasp) -+set(BLAS_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/libopenblas.so ${CMAKE_INSTALL_PREFIX}/lib/libopenblasp.so) - - include(CheckFunctionExists) - set(CMAKE_REQUIRED_INCLUDES math.h) Property changes on: head/science/libcint/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property