<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc3a36100c00ba99e4b83fcf3284a3417b32999e">https://github.com/macports/macports-ports/commit/fc3a36100c00ba99e4b83fcf3284a3417b32999e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new fc3a36100c0 OpenBLAS: follow up after switch to cmake
</span>fc3a36100c0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit fc3a36100c00ba99e4b83fcf3284a3417b32999e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Nov 27 14:23:16 2023 +0000

<span style='display:block; white-space:pre;color:#404040;'>    OpenBLAS: follow up after switch to cmake
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68780
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68782
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68785
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/68788
</span>---
 math/OpenBLAS/Portfile                             | 41 ++++++++++++++++++----
 ...step-of-too-long-args-without-DYNAMIC_ARCH.diff | 32 +++++++++++++++++
 .../patch-openblas.pc-fixed-version-and-url.diff   | 16 +++++++++
 .../files/patch-weak-linking-old-macos.diff        | 21 +++++++++++
 4 files changed, 103 insertions(+), 7 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 337840bc457..a39ccebd9cd 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;'>@@ -33,11 +33,14 @@ if {[string first "-devel" $subport] > 0} {
</span>     checksums       rmd160  30577718a2f6880b2c9a799fa0dcf8830ef91c47 \
                     sha256  7be7acf6cc22c55a36980953942e1f6fecadf993bd6e02b793b70e15fbd25e9e \
                     size    24307835
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        1
</span> 
     conflicts       OpenBLAS
 
     patchfiles      patch-libnoarch.devel.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-openblas.pc-fixed-version-and-url.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-enable-overstep-of-too-long-args-without-DYNAMIC_ARCH.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-weak-linking-old-macos.diff \
</span>                     patch-OpenBLAS-i386-Apple.diff
 
     github.livecheck.branch develop
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,12 +55,15 @@ if {[string first "-devel" $subport] > 0} {
</span>     checksums       rmd160  eea6fe2c33762df4c47c7241808dabbdb085eed3 \
                     sha256  4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 \
                     size    24073168
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision        2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    revision        3
</span> 
     conflicts       OpenBLAS-devel
 
     patchfiles      patch-libnoarch.release.diff \
                     patch-xcode15-fix.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-openblas.pc-fixed-version-and-url.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-enable-overstep-of-too-long-args-without-DYNAMIC_ARCH.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-weak-linking-old-macos.diff \
</span>                     patch-OpenBLAS-i386-Apple.diff
 
     if {![variant_isset native]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,20 +170,41 @@ if {${muniversal.build_arch} ni [list i386 x86_64]} {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DCMAKE_AR=${prefix}/bin/ar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DCMAKE_RANLIB=${prefix}/bin/ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append       -DCMAKE_AR=${prefix}/bin/ar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DCMAKE_NM=${prefix}/bin/nm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DCMAKE_OBJDUMP=${prefix}/bin/objdump \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DCMAKE_RANLIB=${prefix}/bin/ranlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DCMAKE_STRIP=${prefix}/bin/strip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DCMAKE_LINKER=${prefix}/bin/ld
</span> 
 depends_build-append        path:libexec/coreutils/libstdbuf.so:coreutils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:cctools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            port:ld64
</span> depends_skip_archcheck      coreutils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            cctools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            ld64
</span> 
 muniversal.combine          ${prefix}/lib/pkgconfig/openblas.pc
 
 # Build a shared library, not static!
 configure.args-append       -DBUILD_SHARED_LIBS=ON
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# compilers PG adds its own rpath to make GC happy, and cmake adds rpath which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# leads to two rpath and Sonoma linker failed on duplicated rpath. To avoid that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# mess let me remove cmake's rpath.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-delete   -DCMAKE_INSTALL_RPATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace  -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_rpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 23} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.ldflags-delete  -Wl,-rpath,${prefix}/lib/libgcc
</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;'>+
</span> post-destroot {
     # For compatibility, put header files in ${prefix}/include
     foreach h [glob -tails -directory "${destroot}${prefix}/include/openblas" *.h] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/files/patch-enable-overstep-of-too-long-args-without-DYNAMIC_ARCH.diff b/math/OpenBLAS/files/patch-enable-overstep-of-too-long-args-without-DYNAMIC_ARCH.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1d3d7129a59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/files/patch-enable-overstep-of-too-long-args-without-DYNAMIC_ARCH.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OpenMathLib/OpenBLAS/pull/4344
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 69077322a..96edaf503 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,20 +249,20 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "AIX|Android|Linux|FreeBSD|OpenBSD|NetBSD|Drago
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE AND DYNAMIC_ARCH AND BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (APPLE AND BUILD_SHARED_LIBS AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set (CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (NOT NOFORTRAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set (CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set (CMAKE_Fortran_CREATE_SHARED_LIBRARY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ar -ru libopenblas.a && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "sh -c 'ar -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ${CMAKE_AR} -ru libopenblas.a && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "sh -c '${CMAKE_AR} -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c 'echo \"\" | ${CMAKE_Fortran_COMPILER} -o dummy.o -c -x f95-cpp-input - '"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c '${CMAKE_Fortran_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load dummy.o -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c 'ls -l ${CMAKE_BINARY_DIR}/lib'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set (CMAKE_C_CREATE_SHARED_LIBRARY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ar -ru libopenblas.a && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   "sh -c 'ar -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ${CMAKE_AR} -ru libopenblas.a && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   "sh -c '${CMAKE_AR} -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "sh -c '${CMAKE_C_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/files/patch-openblas.pc-fixed-version-and-url.diff b/math/OpenBLAS/files/patch-openblas.pc-fixed-version-and-url.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..442bfb3ae4d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/files/patch-openblas.pc-fixed-version-and-url.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OpenMathLib/OpenBLAS/pull/4341
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/openblas.pc.in cmake/openblas.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7e120af86..11e5606e5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/openblas.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/openblas.pc.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openblas_config=USE_64BITINT=@INTERFACE64@ NO_CBLAS=@NO_CBLAS@ NO_LAPACK=@NO_LAPACK@ NO_LAPACKE=@NO_LAPACKE@ DYNAMIC_ARCH=@DYNAMIC_ARCH@ DYNAMIC_OLDER=@DYNAMIC_OLDER@ NO_AFFINITY=@NO_AFFINITY@ USE_OPENMP=@USE_OPENMP@ @CORE@ MAX_THREADS=@NUM_THREADS@ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Name: OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Version: @OPENBLAS_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-URL: https://github.com/xianyi/OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Version: @OpenBLAS_VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++URL: https://github.com/OpenMathLib/OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Libs: @OpenMP_C_FLAGS@ -L${libdir} -lopenblas${libsuffix} 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/files/patch-weak-linking-old-macos.diff b/math/OpenBLAS/files/patch-weak-linking-old-macos.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5805ce8f64a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/files/patch-weak-linking-old-macos.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/OpenMathLib/OpenBLAS/pull/4348
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7c6b96f41..7e5d1e0fb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,13 +258,13 @@ if (APPLE AND BUILD_SHARED_LIBS AND CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 20)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ${CMAKE_AR} -ru libopenblas.a && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c '${CMAKE_AR} -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c 'echo \"\" | ${CMAKE_Fortran_COMPILER} -o dummy.o -c -x f95-cpp-input - '"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "sh -c '${CMAKE_Fortran_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load dummy.o -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "sh -c '${CMAKE_Fortran_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load dummy.o -undefined dynamic_lookup -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  "sh -c 'ls -l ${CMAKE_BINARY_DIR}/lib'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set (CMAKE_C_CREATE_SHARED_LIBRARY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ${CMAKE_AR} -ru libopenblas.a && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "sh -c '${CMAKE_AR} -ru libopenblas.a ${CMAKE_BINARY_DIR}/driver/others/CMakeFiles/driver_others.dir/xerbla.c.o && exit 0' "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   "sh -c '${CMAKE_C_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   "sh -c '${CMAKE_C_COMPILER} -fpic -shared -Wl,-all_load -Wl,-force_load,libopenblas.a -Wl,-noall_load -undefined dynamic_lookup -o ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopenblas.${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.dylib'")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>