From owner-svn-ports-all@freebsd.org Fri Jun 30 04:28:09 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E37EDD87F0E; Fri, 30 Jun 2017 04:28:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B07867F61B; Fri, 30 Jun 2017 04:28:09 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5U4S8LZ099790; Fri, 30 Jun 2017 04:28:08 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5U4S85P099788; Fri, 30 Jun 2017 04:28:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201706300428.v5U4S85P099788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 30 Jun 2017 04:28:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444694 - in head/math/openblas: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/math/openblas: . files X-SVN-Commit-Revision: 444694 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jun 2017 04:28:10 -0000 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 .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;