<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/018a7046599b062aa6f5af6e6de174c3edcc20b2">https://github.com/macports/macports-ports/commit/018a7046599b062aa6f5af6e6de174c3edcc20b2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 018a7046599b062aa6f5af6e6de174c3edcc20b2
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 23 13:21:59 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> OpenBLAS: use muniversal PG version 1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using v1.1 of the muniversal PG reduced the amount of duplicate code
</span>---
math/OpenBLAS/Portfile | 273 ++++++++++++++-----------------------------------
1 file changed, 77 insertions(+), 196 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/Portfile b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0285933f931..45d0c9bf656 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span> PortGroup compilers 1.0
PortGroup xcode_workaround 1.0
PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,27 +19,7 @@ compiler.cxx_standard 2011
</span> compiler.c_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 10.6 supports down to Intel Core (32-bit) and Core 2 (64-bit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#OS 10.7-10.11 supports down to iMac 7,1, with Intel Core 2 Duo architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#OS 10.12-13 supports down to iMac 10,1, with Intel Core 2 Duo architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} == 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$build_arch eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set blas_arch "CORE2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {$build_arch eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set blas_arch "YONAH"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.major} >= 11 && ${os.major} <= 17} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set blas_arch "CORE2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#OS 10.14 supports down to Mac Pro 5,1 that has Nehalem architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.arch} eq "arm"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set blas_arch "ARMV8"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set blas_arch "NEHALEM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists blas_arch]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 9} {
</span> #For older versions, we force native variant as there is no PPCG3 target in OpenBLAS
default_variants-append +native
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,144 +89,85 @@ xcode_workaround.fixed_xcode_version 11.2
</span> xcode_workaround.type append_to_compiler_name
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makeINC [open ${worksrcpath}-${arch}/Makefile.rule "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "VERSION = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "LIBNAMESUFFIX = "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "CC = ${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "FC = ${configure.fc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} in [list arm64 ppc64 x86_64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BINARY = 64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BINARY = 32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set makeINC [open ${build.dir}/Makefile.rule "w"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "VERSION = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "LIBNAMESUFFIX = "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "COMMON_OPT = -O3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "COMMON_PROF = -pg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "CC = ${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "FC = ${configure.fc}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset lapack]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_LAPACK = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${muniversal.build_arch} in [list arm64 ppc64 x86_64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "BINARY = 64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "BINARY = 32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "COMMON_OPT = -O3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "COMMON_PROF = -pg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset lapack]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_LAPACK = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset native]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We set a minimal target in case native variant is not set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "TARGET = PPCG4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "TARGET = PPC970"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset native]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${muniversal.build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "TARGET = ARMV8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "TARGET = NEHALEM"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists blas_arch]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "TARGET = ${blas_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "TARGET = CORE2"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ni [list i386 x86_64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not on x86 of some sort; just disable AVX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX2 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![avx_compiler_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable AVX2 on OSX10.6 and older only.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX2 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Deactivating AVX512 instructions which do not build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # at this point. Keeping them in -devel subport. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first "-devel" $subport] < 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "TARGET = YONAH"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #Add configurations to build (not configurable yet as per original Makefile.rule)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_SINGLE = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_DOUBLE = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_COMPLEX = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_COMPLEX16 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $makeINC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set makeINC [open ${worksrcpath}/Makefile.rule "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "VERSION = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "LIBNAMESUFFIX = "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "CC = ${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "FC = ${configure.fc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} in [list arm64 ppc64 x86_64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BINARY = 64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BINARY = 32"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "COMMON_OPT = -O3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "COMMON_PROF = -pg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset lapack]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_LAPACK = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset native]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We set a minimal target in case native variant is not set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ppc64 needs G5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc {
</span> puts $makeINC "TARGET = PPCG4"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "TARGET = PPC970"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists blas_arch]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "TARGET = ${blas_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} eq "i386" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This fixes Rosetta build: https://trac.macports.org/ticket/64986
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "HOSTARCH = PPCG4"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "TARGET = PPC970"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This fixes Rosetta build: https://trac.macports.org/ticket/64986
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "HOSTARCH = PPCG4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "TARGET = PPCG4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #Setting up build flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ni [list i386 x86_64]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not on x86 of some sort; just disable AVX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${muniversal.build_arch} ni [list i386 x86_64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # not on x86 of some sort; just disable AVX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX2 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![avx_compiler_isset]} {
</span> puts $makeINC "NO_AVX = 1"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Disable AVX2 on OSX10.6 and older only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} <= 10 } {
</span> puts $makeINC "NO_AVX2 = 1"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Deactivating AVX512 instructions which do not build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # at this point. Keeping them in -devel subport. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string first "-devel" $subport] < 1} {
</span> puts $makeINC "NO_AVX512 = 1"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![avx_compiler_isset]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "Warning: the chosen compiler cannot handle advanced optimisation instructions."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg " AVX instructions are disabled."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Disable AVX2 on OSX10.6 (Darwin10) and older only.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On newer platforms AVX2 is now supported via
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-ports/pull/3486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX2 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Deactivating AVX512 instructions which do not build at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this point. Keeping them in -devel subport. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/57912
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first "-devel" $subport] < 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "NO_AVX512 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #Add configurations to build (not configurable yet as per original Makefile.rule)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_SINGLE = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_DOUBLE = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_COMPLEX = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $makeINC "BUILD_COMPLEX16 = 1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $makeINC
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Add configurations to build (not configurable yet as per original Makefile.rule)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "BUILD_SINGLE = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "BUILD_DOUBLE = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "BUILD_COMPLEX = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $makeINC "BUILD_COMPLEX16 = 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close $makeINC
</span> }
build.args "AR=${prefix}/bin/ar RANLIB=${prefix}/bin/ranlib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,61 +181,21 @@ platform darwin 8 {
</span> test.cmd build.cmd
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+muniversal.combine ${prefix}/lib/pkgconfig/openblas.pc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args "PREFIX=${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Avoid conflict with Atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/include/cblas.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/cblas_openblas.h
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs_to_use} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} ne ${build_arch}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # openblas.pc records the processor name, which is different for 32-bit and 64-bit architectures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/xianyi/OpenBLAS/commit/eb9b021d3890429a41823dc3d90eb0d11c0a6d6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}-${arch}${prefix}/lib/pkgconfig/openblas.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}-${arch}${prefix}/include/cblas.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}-${arch}${prefix}/include/cblas_openblas.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Correct library name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/libopenblas-r1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}-${arch}${prefix}/lib/libopenblas-r1.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete file ${destroot}-${arch}${prefix}/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset lapack]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Install lapacke headers too
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set LAPACKE_DIR [exec /bin/ls ${worksrcpath}/lapack-netlib | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grep -i lapacke]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}-${arch}/lapack-netlib/${LAPACKE_DIR}/include/lapacke_config.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}-${arch}${prefix}/include/lapacke_config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}-${arch}/lapack-netlib/${LAPACKE_DIR}/include/lapacke_mangling.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}-${arch}${prefix}/include/lapacke_mangling.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}-${arch}/lapack-netlib/${LAPACKE_DIR}/include/lapacke_utils.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}-${arch}${prefix}/include/lapacke_utils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}-${arch}/lapack-netlib/${LAPACKE_DIR}/include/lapacke.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}-${arch}${prefix}/include/lapacke.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Avoid conflict with Atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/include/cblas.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/cblas_openblas.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Correct library name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/lib/libopenblas-r1.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/libopenblas-r1.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete file ${destroot}${prefix}/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset lapack]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #Install lapacke headers too
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set LAPACKE_DIR [exec /bin/ls ${worksrcpath}/lapack-netlib | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grep -i lapacke]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/lapack-netlib/${LAPACKE_DIR}/include/lapacke_config.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/lapacke_config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/lapack-netlib/${LAPACKE_DIR}/include/lapacke_mangling.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/lapacke_mangling.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/lapack-netlib/${LAPACKE_DIR}/include/lapacke_utils.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/lapacke_utils.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/lapack-netlib/${LAPACKE_DIR}/include/lapacke.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/lapacke.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${muniversal.build_arch} ne ${configure.build_arch}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^openblas_config=|#openblas_config=|" ${destroot}${prefix}/lib/pkgconfig/openblas.pc
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Correct library name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/libopenblas-r1.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/libopenblas-r1.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete file ${destroot}${prefix}/lib/cmake
</span> }
</pre><pre style='margin:0'>
</pre>