Date: Fri, 30 Jun 2017 04:28:08 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444694 - in head/math/openblas: . files Message-ID: <201706300428.v5U4S85P099788@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Jun 30 04:28:08 2017 New Revision: 444694 URL: https://svnweb.freebsd.org/changeset/ports/444694 Log: math/openblas: unblock on Tier2 architectures - Limit DYNAMIC_ARCH to i386 and amd64 - Fix build on aarch64 [1] PR: 218547 Submitted by: andrew [1] Approved by: portmgr blanket [1], phd_kimberlite@yahoo.co.jp (maintainer) Added: head/math/openblas/files/patch-cpuid__arm64.c (contents, props changed) Modified: head/math/openblas/Makefile (contents, props changed) Modified: head/math/openblas/Makefile ============================================================================== --- head/math/openblas/Makefile Fri Jun 30 01:49:00 2017 (r444693) +++ head/math/openblas/Makefile Fri Jun 30 04:28:08 2017 (r444694) @@ -33,18 +33,21 @@ 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/|} -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 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 <bsd.port.options.mk> .if defined(TARGET_CPU_ARCH) @@ -60,7 +63,7 @@ BUILDFLAGS+= BINARY32=1 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 Added: head/math/openblas/files/patch-cpuid__arm64.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/openblas/files/patch-cpuid__arm64.c Fri Jun 30 04:28:08 2017 (r444694) @@ -0,0 +1,11 @@ +--- cpuid_arm64.c.orig 2016-09-01 03:58:42 UTC ++++ cpuid_arm64.c +@@ -132,6 +132,8 @@ int detect(void) + + + } ++#else ++ return CPU_ARMV8; + #endif + + return CPU_UNKNOWN;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706300428.v5U4S85P099788>