Attachment #183800 for bug #218547

Lines 33-40 Link Here

(-)math/openblas/Makefile (working copy) (-5 / +8 lines)
33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}	33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}
34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}	34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
35	OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2	35	OPTIONS_DEFINE= INTERFACE64 OPENMP
		36	OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2
		37	OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
		38	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
		39	OPTIONS_DEFAULT_i386= DYNAMIC_ARCH
		40	OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
		41	.endif
		42
36	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64	43	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64
37	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures	44	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures
38	OPENMP_DESC= Use OpenMP for threading	45	OPENMP_DESC= Use OpenMP for threading
Lines 41-50 Link Here
41	AVX_DESC= Support Advanced Vector Extensions (AVX)	48	AVX_DESC= Support Advanced Vector Extensions (AVX)
42	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)	49	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
43	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
44	OPTIONS_DEFAULT= DYNAMIC_ARCH
45	.endif
46
47	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
48	.if defined(TARGET_CPU_ARCH)	51	.if defined(TARGET_CPU_ARCH)
Lines 60-66 Link Here
60	BUILDFLAGS+= BINARY64=1	63	BUILDFLAGS+= BINARY64=1
61	.endif	64	.endif

Lines 33-40 Link Here

(-)math/openblas/Makefile (working copy) (-5 / +8 lines)
33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}	33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}
34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}	34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
35	OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2	35	OPTIONS_DEFINE= INTERFACE64 OPENMP
		36	OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2
		37	OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
		38	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
		39	OPTIONS_DEFAULT_i386= DYNAMIC_ARCH
		40	OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
		41	.endif
		42
36	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64	43	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64
37	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures	44	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures
38	OPENMP_DESC= Use OpenMP for threading	45	OPENMP_DESC= Use OpenMP for threading
Lines 41-50 Link Here
41	AVX_DESC= Support Advanced Vector Extensions (AVX)	48	AVX_DESC= Support Advanced Vector Extensions (AVX)
42	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)	49	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
43	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
44	OPTIONS_DEFAULT= DYNAMIC_ARCH
45	.endif
46
47	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
48	.if defined(TARGET_CPU_ARCH)	51	.if defined(TARGET_CPU_ARCH)
Lines 60-66 Link Here
60	BUILDFLAGS+= BINARY64=1	63	BUILDFLAGS+= BINARY64=1
61	.endif	64	.endif

Lines 33-40 Link Here

(-)math/openblas/Makefile (working copy) (-5 / +8 lines)
33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}	33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}
34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}	34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
35	OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2	35	OPTIONS_DEFINE= INTERFACE64 OPENMP
		36	OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2
		37	OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
		38	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
		39	OPTIONS_DEFAULT_i386= DYNAMIC_ARCH
		40	OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
		41	.endif
		42
36	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64	43	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64
37	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures	44	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures
38	OPENMP_DESC= Use OpenMP for threading	45	OPENMP_DESC= Use OpenMP for threading
Lines 41-50 Link Here
41	AVX_DESC= Support Advanced Vector Extensions (AVX)	48	AVX_DESC= Support Advanced Vector Extensions (AVX)
42	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)	49	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
43	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
44	OPTIONS_DEFAULT= DYNAMIC_ARCH
45	.endif
46
47	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
48	.if defined(TARGET_CPU_ARCH)	51	.if defined(TARGET_CPU_ARCH)
Lines 60-66 Link Here
60	BUILDFLAGS+= BINARY64=1	63	BUILDFLAGS+= BINARY64=1
61	.endif	64	.endif

Lines 33-40 Link Here

(-)math/openblas/Makefile (working copy) (-5 / +8 lines)
33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}	33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}
34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}	34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
35	OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2	35	OPTIONS_DEFINE= INTERFACE64 OPENMP
		36	OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2
		37	OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
		38	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
		39	OPTIONS_DEFAULT_i386= DYNAMIC_ARCH
		40	OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
		41	.endif
		42
36	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64	43	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64
37	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures	44	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures
38	OPENMP_DESC= Use OpenMP for threading	45	OPENMP_DESC= Use OpenMP for threading
Lines 41-50 Link Here
41	AVX_DESC= Support Advanced Vector Extensions (AVX)	48	AVX_DESC= Support Advanced Vector Extensions (AVX)
42	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)	49	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
43	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
44	OPTIONS_DEFAULT= DYNAMIC_ARCH
45	.endif
46
47	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
48	.if defined(TARGET_CPU_ARCH)	51	.if defined(TARGET_CPU_ARCH)
Lines 60-66 Link Here
60	BUILDFLAGS+= BINARY64=1	63	BUILDFLAGS+= BINARY64=1
61	.endif	64	.endif

Lines 33-40 Link Here

(-)math/openblas/Makefile (working copy) (-6 / +9 lines)
33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}	33	OPENBLAS_FILES= ${OPENBLAS_LIBS:S\|$\|.so\|} ${OPENBLAS_LIBS:S\|$\|.so.${OPENBLAS_SVER}\|} ${OPENBLAS_LIBS:S\|$\|.a\|}
34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}	34	PLIST_FILES= ${OPENBLAS_FILES:S\|^\|lib/\|}
35	OPTIONS_DEFINE= DYNAMIC_ARCH INTERFACE64 OPENMP AVX AVX2	35	OPTIONS_DEFINE= INTERFACE64 OPENMP
		36	OPTIONS_DEFINE_i386= DYNAMIC_ARCH AVX AVX2
		37	OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386}
		38	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
		39	OPTIONS_DEFAULT_i386= DYNAMIC_ARCH
		40	OPTIONS_DEFAULT_amd64= DYNAMIC_ARCH
		41	.endif
		42
36	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64	43	DYNAMIC_ARCH_DESC= Support multiple CPU types on i386 and amd64
37	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures	44	INTERFACE64_DESC= Use 8 byte integers on 64-bit architectures
38	OPENMP_DESC= Use OpenMP for threading	45	OPENMP_DESC= Use OpenMP for threading
Lines 41-50 Link Here
41	AVX_DESC= Support Advanced Vector Extensions (AVX)	48	AVX_DESC= Support Advanced Vector Extensions (AVX)
42	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)	49	AVX2_DESC= Support Advanced Vector Extensions 2 (AVX2)
43	.if defined(BATCH) \|\| defined(PACKAGE_BUILDING)
44	OPTIONS_DEFAULT= DYNAMIC_ARCH
45	.endif
46
47	.include <bsd.port.options.mk>	50	.include <bsd.port.options.mk>
48	.if defined(TARGET_CPU_ARCH)	51	.if defined(TARGET_CPU_ARCH)
Lines 60-66 Link Here
60	BUILDFLAGS+= BINARY64=1	63	BUILDFLAGS+= BINARY64=1
61	.endif	64	.endif
62	.if ! ( ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" \|\| ${ARCH} == "i386" ) )	65	.if ! ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" \|\| ${ARCH} == "i386" )
63	MANUAL_PACKAGE_BUILD= Optimizes for the build machine.	66	MANUAL_PACKAGE_BUILD= Optimizes for the build machine.
64	.endif	67	.endif

Line 0 Link Here

(-)math/openblas/files/patch-cpuid__arm64.c (working copy) (+11 lines)
	1	--- cpuid_arm64.c.orig 2017-06-26 08:21:21.108947000 +0000
	2	+++ cpuid_arm64.c 2017-06-26 08:25:09.130107000 +0000
	3	@@ -132,6 +132,8 @@ int detect(void)
	4
	5
	6	}
	7	+#else
	8	+ return CPU_ARMV8;
	9	#endif
	10
	11	return CPU_UNKNOWN;

Return to bug 218547