CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 17 Sep 2023 08:56:19 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Sep 17 08:56:19 UTC 2023

Modified Files:
        pkgsrc/math/openblas: Makefile Makefile.common buildlink3.mk distinfo
            version.mk
        pkgsrc/math/openblas/patches: patch-Makefile.install patch-f_check
        pkgsrc/math/openblas_openmp: Makefile
        pkgsrc/math/openblas_pthread: Makefile
Removed Files:
        pkgsrc/math/openblas/patches: patch-getarch.c

Log Message:
openblas*: updated to 0.3.24

OpenBLAS 0.3.24

general:

declared the arguments of cblas_xerbla as const (in accordance with the reference implementation
and others, the previous discrepancy appears to have dated back to GotoBLAS)
fixed the implementation of ?GEMMT that was added in 0.3.23
made cpu-specific SWITCH_RATIO parameters for GEMM available to DYNAMIC_ARCH builds
fixed application of SYMBOLSUFFIX in CMAKE builds
fixed missing SSYCONVF function in the shared library
fixed parallel build logic used with gmake
added support for compilation with LLVM17, in particular its new Fortran compiler
added support for CMAKE builds using the NVIDIA HPC compiler
fixed INTERFACE64 builds with CMAKE and the f95 Fortran compiler
fixed cross-build detection and management in c_check
disabled building of the tests with CMAKE when ONLY_CBLAS is defined
fixed several issues with the handling of runtime limits on the number of OPENMP threads
corrected the error code returned by SGEADD/DGEADD when LDA is too small
corrected the error code returned by IMATCOPY when LDB is too small
updated ?NRM2 to support negative increment values (as introduced in release 3.10.0
of the Reference BLAS)
updated ?ROTG to use the safe scaling algorithm introduced in release 3.10.0 of the Reference BLAS
fixed OpenMP builds with CLANG for the case where libomp is not in a standard location
fixed a potential overwrite of unrelated memory during thread initialisation on startup
fixed a potential integer overflow in the multithreading threshold for ?SYMM/?SYRK
fixed build of the LAPACKE interfaces for the LAPACK 3.11.0 ?TRSYL functions added in 0.3.22
fixed installation of .cmake files in concurrent 32 and 64bit builds with CMAKE
applied additions and corrections from the development branch of Reference-LAPACK:
fixed actual arguments passed to a number of LAPACK functions (from Reference-LAPACK PR 885)
fixed workspace query results in LAPACK ?SYTRF/?TRECV3 (from Reference-LAPACK PR 883)
fixed derivation of the UPLO parameter in LAPACKE_?larfb (from Reference-LAPACK PR 878)
fixed a crash in LAPACK ?GELSDD on NRHS=0 (from Reference-LAPACK PR 876)
added new LAPACK utility functions CRSCL and ZRSCL (from Reference-LAPACK PR 839)
corrected the order of eigenvalues for 2x2 matrices in ?STEMR (Reference-LAPACK PR 867)
removed spurious reference to OpenMP variables outside OpenMP contexts (Reference-LAPACK PR 860)
updated file comments on use of LAMBDA variable in LAPACK (Reference-LAPACK PR 852)
fixed documentation of LAPACK SLASD0/DLASD0 (Reference-LAPACK PR 855)
fixed confusing use of "minor" in LAPACK documentation (Reference-LAPACK PR 849)
added new LAPACK functions ?GEDMD for dynamic mode decomposition (Reference-LAPACK PR 736)
fixed potential stack overflows in the EIG part of the LAPACK testsuite (Reference-LAPACK PR 854)
applied small improvements to the variants of Cholesky and QR functions (Reference-LAPACK PR 847)
removed unused variables from LAPACK ?BDSQR (Reference-LAPACK PR 832)
fixed a potential crash on allocation failure in LAPACKE SGEESX/DGEESX (Reference-LAPACK PR 836)
added a quick return from SLARUV/DLARUV for N < 1 (Reference-LAPACK PR 837)
updated function descriptions in LAPACK ?GEGS/?GEGV (Reference-LAPACK PR 831)
improved algorithm description in ?GELSY (Reference-LAPACK PR 833)
fixed scaling in LAPACK STGSNA/DTGSNA (Reference-LAPACK PR 830)
fixed crash in LAPACKE_?geqrt with row-major data (Reference-LAPACK PR 768)
added LAPACKE interfaces for C/ZUNHR_COL and S/DORHR_COL (Reference-LAPACK PR 827)
added error exit tests for SYSV/SYTD2/GEHD2 to the testsuite (Reference-LAPACK PR 795)
fixed typos in LAPACK source and comments (Reference-LAPACK PRs 809,811,812,814,820)
adopt refactored ?GEBAL implementation (Reference-LAPACK PR 808)

x86_64:

added cpu model autodetection for Intel Alder Lake N
added activation of the AMX tile to the Sapphire Rapids SBGEMM kernel
worked around miscompilations of GEMV/SYMV kernels by gcc's tree-vectorizer
fixed compilation of Cooperlake and Sapphire Rapids kernels with CLANG
fixed runtime detection of Cooperlake and Sapphire Rapids in DYNAMIC_ARCH
fixed feature-based cputype fallback in DYNAMIC_ARCH
added support for building the AVX512 kernels with the NVIDIA HPC compiler
corrected ZAXPY result on old pre-AVX hardware for the INCX=0 case
fixed a potential use of uninitialized variables in ZTRSM

ARMV8:

added cpu model autodetection for Apple M2
fixed wrong results of CGEMM/CTRMM/DNRM2 under OSX (use of reserved register)
added support for building the SVE kernels with the NVIDIA HPC compiler
added support for building the SVE kernels with the Apple Clang compiler
fixed compiler option handling for building the SVE kernels with LLVM
implemented SWITCH_RATIO parameter for improved GEMM performance on Neoverse
activated SVE SGEMM and DGEMM kernels for Neoverse V1
improved performance of the SVE CGEMM and ZGEMM kernels on Neoverse V1
improved kernel selection for the ARMV8SVE target and added it to DYNAMIC_ARCH
fixed runtime check for SVE availability in DYNAMIC_ARCH builds to take OS or
container restrictions into account
fixed a potential use of uninitialized variables in ZTRSM
fix a potential misdetection of ARMV8 hardware as 32bit in CMAKE builds

LOONGARCH64:

added ABI detection
added support for cpu affinity handling
fixed compilation with early versions of the Loongson toolchain
added an optimized SGEMM kernel for 3A5000
added optimized DGEMV kernels for 3A5000
improved the performance of the DGEMM kernel for 3A5000

MIPS64:

fixed miscompilation of TRMM kernels for the MIPS64_GENERIC target

POWER:

fixed compiler warnings in the POWER10 SBGEMM kernel

RISCV:

fixed application of the INTERFACE64 option when building with CMAKE
fix a potential misdetection of RISCV hardware as 32bit in CMAKE builds
fixed IDAMAX and DOT kernels for C910V
fixed corner cases in the ROT and SWAP kernels for C910V
fixed compilation of the C910V target with recent vendor compilers


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/openblas/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/openblas/Makefile.common \
    pkgsrc/math/openblas/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/openblas/buildlink3.mk \
    pkgsrc/math/openblas/version.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/openblas/patches/patch-Makefile.install
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/openblas/patches/patch-f_check
cvs rdiff -u -r1.2 -r0 pkgsrc/math/openblas/patches/patch-getarch.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/openblas_openmp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/openblas_pthread/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/openblas/Makefile
diff -u pkgsrc/math/openblas/Makefile:1.5 pkgsrc/math/openblas/Makefile:1.6
--- pkgsrc/math/openblas/Makefile:1.5   Tue Jun 28 11:34:37 2022
+++ pkgsrc/math/openblas/Makefile       Sun Sep 17 08:56:18 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/06/28 11:34:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2023/09/17 08:56:18 adam Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   2
 
 OPENBLAS_VARIANT=      openblas
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas/Makefile.common
diff -u pkgsrc/math/openblas/Makefile.common:1.7 pkgsrc/math/openblas/Makefile.common:1.8
--- pkgsrc/math/openblas/Makefile.common:1.7    Thu Feb  3 19:28:19 2022
+++ pkgsrc/math/openblas/Makefile.common        Sun Sep 17 08:56:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2022/02/03 19:28:19 bacon Exp $
+# $NetBSD: Makefile.common,v 1.8 2023/09/17 08:56:18 adam Exp $
 #
 # used by math/openblas_pthread/Makefile
 # used by math/openblas_openmp/Makefile
@@ -107,7 +107,6 @@ PLIST_SRC=  ${.CURDIR}/../../math/openbla
 PLIST_SUBST+=  OPENBLAS_VARIANT=${OPENBLAS_VARIANT}
 
 post-extract:
-       rm ${WRKSRC}/relapack/src/lapack_wrappers.c.orig
        (cd ${DISTDIR}/${DIST_SUBDIR} && \
                ${CP} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC})
 
Index: pkgsrc/math/openblas/distinfo
diff -u pkgsrc/math/openblas/distinfo:1.7 pkgsrc/math/openblas/distinfo:1.8
--- pkgsrc/math/openblas/distinfo:1.7   Tue Oct 26 10:55:50 2021
+++ pkgsrc/math/openblas/distinfo       Sun Sep 17 08:56:18 2023
@@ -1,21 +1,20 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:55:50 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/09/17 08:56:18 adam Exp $
 
-BLAKE2s (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = 45b51a75dee57612fc8d92b15eea54bb4197608ac0b6613e495c5553135ca90b
-SHA512 (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = c07964ead5ffe9cf088364697bfe5cb409170663e420bdcd08a6366a028625d2a3c23ee4ddbaf0e625860a9fd08cbbb39f97eb985c366c052696d6f8598a844f
-Size (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = 12498434 bytes
-BLAKE2s (openblas-0.3.15/large.tgz) = 68489cf503f8671e9228831d96cc514172b93f5c2e0f2c72038651a5a219cb2f
-SHA512 (openblas-0.3.15/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
-Size (openblas-0.3.15/large.tgz) = 2595 bytes
-BLAKE2s (openblas-0.3.15/timing.tgz) = dc47df7bd85a88f9f7f31741ed2a4630511f9105075290c3d5df4aeeaf6f45b8
-SHA512 (openblas-0.3.15/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
-Size (openblas-0.3.15/timing.tgz) = 1059485 bytes
+BLAKE2s (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 38e4cee9b05aaa4d2f90682c609f3d93a802a594920240fefa808bf3323f593c
+SHA512 (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0
+Size (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 24263037 bytes
+BLAKE2s (openblas-0.3.24/large.tgz) = 68489cf503f8671e9228831d96cc514172b93f5c2e0f2c72038651a5a219cb2f
+SHA512 (openblas-0.3.24/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
+Size (openblas-0.3.24/large.tgz) = 2595 bytes
+BLAKE2s (openblas-0.3.24/timing.tgz) = dc47df7bd85a88f9f7f31741ed2a4630511f9105075290c3d5df4aeeaf6f45b8
+SHA512 (openblas-0.3.24/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
+Size (openblas-0.3.24/timing.tgz) = 1059485 bytes
 SHA1 (patch-Makefile) = 6b1db300b5487fca53e7c41c27b64017658e6375
-SHA1 (patch-Makefile.install) = c4245692ca4b17d49048feb083a500a33b809ab2
+SHA1 (patch-Makefile.install) = b4e12a4727a3599f1d63fc134a5db02948136259
 SHA1 (patch-Makefile.rule) = 45b6b4576fb521fa093252c63b899d4178a516b6
 SHA1 (patch-Makefile.system) = 6dc9fd85731ca88cb1fdb9063ba3baa31edbcfb8
 SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9
 SHA1 (patch-cpuid__arm.c) = 20f95cede90cbe548c0cd09ed2e3d37d1d4aeabd
 SHA1 (patch-cpuid_ia64.c) = 39649319b8c0a37b8d494e3c03b1ddb6fb616603
-SHA1 (patch-f_check) = 9181958ddd7dca16f28b1144ce7f400b5ab36301
-SHA1 (patch-getarch.c) = 0cf098b7203586206df95b24d1e95b0b5b9fd500
+SHA1 (patch-f_check) = 11f22d0dded9f7b64fb8028693f64fc24f2016a3
 SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad

Index: pkgsrc/math/openblas/buildlink3.mk
diff -u pkgsrc/math/openblas/buildlink3.mk:1.3 pkgsrc/math/openblas/buildlink3.mk:1.4
--- pkgsrc/math/openblas/buildlink3.mk:1.3      Tue Jun 28 11:34:37 2022
+++ pkgsrc/math/openblas/buildlink3.mk  Sun Sep 17 08:56:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/06/28 11:34:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/09/17 08:56:18 adam Exp $
 
 BUILDLINK_TREE+=       openblas
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        openblas
 OPENBLAS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openblas+=       openblas>=0.3.5
-BUILDLINK_ABI_DEPENDS.openblas?=       openblas>=0.3.15nb2
+BUILDLINK_ABI_DEPENDS.openblas+=       openblas>=0.3.15nb2
 BUILDLINK_PKGSRCDIR.openblas?=         ../../math/openblas
 .endif # OPENBLAS_BUILDLINK3_MK
 
Index: pkgsrc/math/openblas/version.mk
diff -u pkgsrc/math/openblas/version.mk:1.3 pkgsrc/math/openblas/version.mk:1.4
--- pkgsrc/math/openblas/version.mk:1.3 Sat May 29 19:57:21 2021
+++ pkgsrc/math/openblas/version.mk     Sun Sep 17 08:56:18 2023
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.3 2021/05/29 19:57:21 thor Exp $
+# $NetBSD: version.mk,v 1.4 2023/09/17 08:56:18 adam Exp $
 
-OPENBLAS_VERSION=      0.3.15
+OPENBLAS_VERSION=      0.3.24

Index: pkgsrc/math/openblas/patches/patch-Makefile.install
diff -u pkgsrc/math/openblas/patches/patch-Makefile.install:1.4 pkgsrc/math/openblas/patches/patch-Makefile.install:1.5
--- pkgsrc/math/openblas/patches/patch-Makefile.install:1.4     Mon Jun  7 15:52:04 2021
+++ pkgsrc/math/openblas/patches/patch-Makefile.install Sun Sep 17 08:56:19 2023
@@ -1,31 +1,23 @@
-$NetBSD: patch-Makefile.install,v 1.4 2021/06/07 15:52:04 adam Exp $
+$NetBSD: patch-Makefile.install,v 1.5 2023/09/17 08:56:19 adam Exp $
 
 Second part of removing the special library names.
 Separate options for "install" (needed at least on Darwin).
 
---- Makefile.install.orig      2021-05-02 21:50:22.000000000 +0000
+--- Makefile.install.orig      2023-09-03 20:58:32.000000000 +0000
 +++ Makefile.install
-@@ -74,40 +74,46 @@ endif
- ifneq ($(OSNAME), AIX)
- ifndef NO_LAPACKE
-       @echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
--      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
--      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
--      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
--      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
--      @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
-+      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
-+      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
-+      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
-+      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
-+      @-install -p -m 644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
- endif
- 
- #for install static library
+@@ -17,7 +17,7 @@ PKG_EXTRALIB := $(EXTRALIB)
+ ifeq ($(INTERFACE64),1)
+       SUFFIX64=64
+ endif
+-PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
++PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
+ 
+ ifeq ($(USE_OPENMP), 1)
+   ifeq ($(C_COMPILER), PGI)
+@@ -90,29 +90,37 @@ endif
  ifneq ($(NO_STATIC),1)
        @echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
--      @install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
-+      @install -p -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+       @install -m644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
 +ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
        @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
        ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
@@ -35,7 +27,7 @@ Separate options for "install" (needed a
  ifneq ($(NO_SHARED),1)
        @echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
  ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
-       @install -pm755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+       @install -m755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
        @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
 -      ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
 -      ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
@@ -56,12 +48,13 @@ Separate options for "install" (needed a
        @-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
        @-install_name_tool -id "$(OPENBLAS_LIBRARY_DIR)/$(LIBPREFIX).$(MAJOR_VERSION).dylib" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
        @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
--      ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib ; \
-+      if ! test $(LIBDYNNAME) = $(LIBPREFIX).dylib; then ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib; fi ; \
++      if ! test $(LIBDYNNAME) = $(LIBPREFIX).dylib; then \
+       ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib ; \
++      fi ; \
        ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
  endif
  ifeq ($(OSNAME), WINNT)
-@@ -135,28 +141,32 @@ endif
+@@ -140,16 +148,20 @@ endif
  ifneq ($(NO_STATIC),1)
        @echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
        @installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
@@ -80,25 +73,25 @@ Separate options for "install" (needed a
 +      if ! test $(LIBSONAME) = $(LIBPREFIX).so; then \
 +      ln -fs $(LIBSONAME) $(LIBPREFIX).so ; fi ; \
 +      if ! test $(LIBSONAME) = $(LIBPREFIX).so.$(MAJOR_VERSION); then \
-+      ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION) ; fi
++      ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION); fi
  endif
  
  endif
- 
- #Generating openblas.pc
-       @echo Generating $(LIBSONAMEBASE).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
--      @echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
--      @echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
--      @echo 'openblas_config= USE_64BITINT='$(USE_64BITINT) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 
'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
--      @echo 'version='$(VERSION) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
--      @echo 'extralib='$(PKG_EXTRALIB) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
--      @cat openblas.pc.in >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE).pc"
-+      @echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
-+      @echo 'includedir='$(OPENBLAS_INCLUDE_DIR) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
-+      @echo 'openblas_config= USE_64BITINT='$(USE_64BITINT) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 
'NO_LAPACKE='$(NO_LAPACKE) 'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
-+      @echo 'version='$(VERSION) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
-+      @echo 'extralib='$(PKG_EXTRALIB) >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
-+      @cat openblas.pc.in | sed -e 's,-lopenblas$$,-l$(LIBNAMEBASE),' >> "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
+@@ -158,7 +170,7 @@ endif
+ ifeq ($(INTERFACE64),1)
+       SUFFIX64=64
+ endif
+-      PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
++      PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
+ 
+       @echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
+       @echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)"
+@@ -167,7 +179,7 @@ endif
+       @echo 'openblas_config= USE_64BITINT='$(INTERFACE64) 'DYNAMIC_ARCH='$(DYNAMIC_ARCH) 'DYNAMIC_OLDER='$(DYNAMIC_OLDER) 'NO_CBLAS='$(NO_CBLAS) 'NO_LAPACK='$(NO_LAPACK) 'NO_LAPACKE='$(NO_LAPACKE) 
'NO_AFFINITY='$(NO_AFFINITY) 'USE_OPENMP='$(USE_OPENMP) $(CORE) 'MAX_THREADS='$(NUM_THREADS)>> "$(PKGFILE)"
+       @echo 'version='$(VERSION) >> "$(PKGFILE)"
+       @echo 'extralib='$(PKG_EXTRALIB) >> "$(PKGFILE)"
+-      @cat openblas.pc.in >> "$(PKGFILE)"
++      @cat openblas.pc.in | sed -e 's,-lopenblas$$,-l$(LIBNAMEBASE),' >> "$(PKGFILE)"
  
  
  #Generating OpenBLASConfig.cmake

Index: pkgsrc/math/openblas/patches/patch-f_check
diff -u pkgsrc/math/openblas/patches/patch-f_check:1.2 pkgsrc/math/openblas/patches/patch-f_check:1.3
--- pkgsrc/math/openblas/patches/patch-f_check:1.2      Sat May 29 19:57:21 2021
+++ pkgsrc/math/openblas/patches/patch-f_check  Sun Sep 17 08:56:19 2023
@@ -1,24 +1,14 @@
-$NetBSD: patch-f_check,v 1.2 2021/05/29 19:57:21 thor Exp $
+$NetBSD: patch-f_check,v 1.3 2023/09/17 08:56:19 adam Exp $
 
 Clean up link flags
 
---- f_check.orig       2021-05-02 21:50:22.000000000 +0000
+--- f_check.orig       2023-09-16 03:38:55.102587862 +0000
 +++ f_check
-@@ -326,7 +326,7 @@ if ($link ne "") {
- 
-     foreach $flags (@flags) {
-       if (
--          ($flags =~ /^\-L/)
-+          ($flags =~ /^\-L\S/)
-           && ($flags !~ /^-LIST:/)
-           && ($flags !~ /^-LANG:/)
-           ) {
-@@ -358,7 +358,7 @@ if ($link ne "") {
-       }
- 
-       if (
--          ($flags =~ /^\-l/)
-+          ($flags =~ /^\-l\S/)
-           && ($flags !~ /ibrary/)
-           && ($flags !~ /gfortranbegin/)
-           && ($flags !~ /frtbegin/)
+@@ -334,6 +334,7 @@ if [ -n "$link" ]; then
+     for flag in $flags; do
+         case "$flag" in -L*)
+             case "$flag" in
++                -L) ;;
+                 -LIST:*|-LANG:*) ;;
+                 *) linker_L="$linker_L $flag" ;;
+             esac

Index: pkgsrc/math/openblas_openmp/Makefile
diff -u pkgsrc/math/openblas_openmp/Makefile:1.3 pkgsrc/math/openblas_openmp/Makefile:1.4
--- pkgsrc/math/openblas_openmp/Makefile:1.3    Tue Jun 15 04:41:53 2021
+++ pkgsrc/math/openblas_openmp/Makefile        Sun Sep 17 08:56:19 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2021/06/15 04:41:53 thor Exp $
+# $NetBSD: Makefile,v 1.4 2023/09/17 08:56:19 adam Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
 
 OPENBLAS_VARIANT= openblas_openmp
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas_pthread/Makefile
diff -u pkgsrc/math/openblas_pthread/Makefile:1.3 pkgsrc/math/openblas_pthread/Makefile:1.4
--- pkgsrc/math/openblas_pthread/Makefile:1.3   Tue Jun 15 04:41:53 2021
+++ pkgsrc/math/openblas_pthread/Makefile       Sun Sep 17 08:56:19 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2021/06/15 04:41:53 thor Exp $
+# $NetBSD: Makefile,v 1.4 2023/09/17 08:56:19 adam Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
 
 OPENBLAS_VARIANT= openblas_pthread
 .include "../../math/openblas/Makefile.common"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index