Index: math/openblas/Makefile =================================================================== --- math/openblas/Makefile (revision 444357) +++ math/openblas/Makefile (working copy) @@ -33,8 +33,15 @@ OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} -OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2 +OPTIONS_DEFINE= INTERFACE64 OPENMP +OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +.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 @@ -41,10 +48,6 @@ AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -.if defined(BATCH) || defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT= DYNAMIC_ARCH -.endif - .include .if defined(TARGET_CPU_ARCH) @@ -60,7 +63,7 @@ BUILDFLAGS+= BINARY64=1 .endif Index: math/openblas/Makefile =================================================================== --- math/openblas/Makefile (revision 444357) +++ math/openblas/Makefile (working copy) @@ -33,8 +33,15 @@ OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} -OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2 +OPTIONS_DEFINE= INTERFACE64 OPENMP +OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +.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 @@ -41,10 +48,6 @@ AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -.if defined(BATCH) || defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT= DYNAMIC_ARCH -.endif - .include .if defined(TARGET_CPU_ARCH) @@ -60,7 +63,7 @@ BUILDFLAGS+= BINARY64=1 .endif Index: math/openblas/Makefile =================================================================== --- math/openblas/Makefile (revision 444357) +++ math/openblas/Makefile (working copy) @@ -33,8 +33,15 @@ OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} -OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2 +OPTIONS_DEFINE= INTERFACE64 OPENMP +OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +.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 @@ -41,10 +48,6 @@ AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -.if defined(BATCH) || defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT= DYNAMIC_ARCH -.endif - .include .if defined(TARGET_CPU_ARCH) @@ -60,7 +63,7 @@ BUILDFLAGS+= BINARY64=1 .endif Index: math/openblas/Makefile =================================================================== --- math/openblas/Makefile (revision 444357) +++ math/openblas/Makefile (working copy) @@ -33,8 +33,15 @@ OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} -OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2 +OPTIONS_DEFINE= INTERFACE64 OPENMP +OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +.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 @@ -41,10 +48,6 @@ AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -.if defined(BATCH) || defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT= DYNAMIC_ARCH -.endif - .include .if defined(TARGET_CPU_ARCH) @@ -60,7 +63,7 @@ BUILDFLAGS+= BINARY64=1 .endif Index: math/openblas/Makefile =================================================================== --- math/openblas/Makefile (revision 444357) +++ math/openblas/Makefile (working copy) @@ -33,8 +33,15 @@ OPENBLAS_FILES= ${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} ${OPENBLAS_LIBS:S|$|.a|} PLIST_FILES= ${OPENBLAS_FILES:S|^|lib/|} -OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2 +OPTIONS_DEFINE= INTERFACE64 OPENMP +OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2 +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} +.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 @@ -41,10 +48,6 @@ AVX_DESC= Support Advanced Vector Extensions (AVX) AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2) -.if defined(BATCH) || defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT= DYNAMIC_ARCH -.endif - .include .if defined(TARGET_CPU_ARCH) @@ -60,7 +63,7 @@ BUILDFLAGS+= BINARY64=1 .endif -.if ! ( ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) ) +.if ! ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) MANUAL_PACKAGE_BUILD= Optimizes for the build machine. .endif Index: math/openblas/files/patch-cpuid__arm64.c =================================================================== --- math/openblas/files/patch-cpuid__arm64.c (nonexistent) +++ math/openblas/files/patch-cpuid__arm64.c (working copy) @@ -0,0 +1,11 @@ +--- cpuid_arm64.c.orig 2017-06-26 08:21:21.108947000 +0000 ++++ cpuid_arm64.c 2017-06-26 08:25:09.130107000 +0000 +@@ -132,6 +132,8 @@ int detect(void) + + + } ++#else ++ return CPU_ARMV8; + #endif + + return CPU_UNKNOWN; Property changes on: math/openblas/files/patch-cpuid__arm64.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property