Sun Oct 8 15:41:33 2023 UTC ()
math/openblas: Fix pkg-config file for current version.

The last update broke the library name in the installed pkg-config file
for the openblas variants. Fixing this.

Our type of library naming should be pushed upstream, or adapted to
some other scheme.


(thor)
diff -r1.6 -r1.7 pkgsrc/math/openblas/Makefile
diff -r1.8 -r1.9 pkgsrc/math/openblas/distinfo
diff -r1.5 -r1.6 pkgsrc/math/openblas/patches/patch-Makefile.install
diff -r1.1 -r1.2 pkgsrc/math/openblas64/Makefile
diff -r1.1 -r1.2 pkgsrc/math/openblas64_openmp/Makefile
diff -r1.1 -r1.2 pkgsrc/math/openblas64_pthread/Makefile
diff -r1.4 -r1.5 pkgsrc/math/openblas_openmp/Makefile
diff -r1.4 -r1.5 pkgsrc/math/openblas_pthread/Makefile
cvs diff -r1.6 -r1.7 pkgsrc/math/openblas/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openblas/Makefile 2023/09/17 08:56:18 1.6
+++ pkgsrc/math/openblas/Makefile 2023/10/08 15:41:33 1.7
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.6 2023/09/17 08:56:18 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2023/10/08 15:41:33 thor Exp $
2 2
3MAINTAINER= thomas.orgis@uni-hamburg.de 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4PKGREVISION= 1
4 5
5OPENBLAS_VARIANT= openblas 6OPENBLAS_VARIANT= openblas
6.include "../../math/openblas/Makefile.common" 7.include "../../math/openblas/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/math/openblas/distinfo (expand / switch to unified diff)

--- pkgsrc/math/openblas/distinfo 2023/09/17 08:56:18 1.8
+++ pkgsrc/math/openblas/distinfo 2023/10/08 15:41:33 1.9
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.8 2023/09/17 08:56:18 adam Exp $ 1$NetBSD: distinfo,v 1.9 2023/10/08 15:41:33 thor Exp $
2 2
3BLAKE2s (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 38e4cee9b05aaa4d2f90682c609f3d93a802a594920240fefa808bf3323f593c 3BLAKE2s (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 38e4cee9b05aaa4d2f90682c609f3d93a802a594920240fefa808bf3323f593c
4SHA512 (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0 4SHA512 (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0
5Size (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 24263037 bytes 5Size (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 24263037 bytes
6BLAKE2s (openblas-0.3.24/large.tgz) = 68489cf503f8671e9228831d96cc514172b93f5c2e0f2c72038651a5a219cb2f 6BLAKE2s (openblas-0.3.24/large.tgz) = 68489cf503f8671e9228831d96cc514172b93f5c2e0f2c72038651a5a219cb2f
7SHA512 (openblas-0.3.24/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965 7SHA512 (openblas-0.3.24/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
8Size (openblas-0.3.24/large.tgz) = 2595 bytes 8Size (openblas-0.3.24/large.tgz) = 2595 bytes
9BLAKE2s (openblas-0.3.24/timing.tgz) = dc47df7bd85a88f9f7f31741ed2a4630511f9105075290c3d5df4aeeaf6f45b8 9BLAKE2s (openblas-0.3.24/timing.tgz) = dc47df7bd85a88f9f7f31741ed2a4630511f9105075290c3d5df4aeeaf6f45b8
10SHA512 (openblas-0.3.24/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af 10SHA512 (openblas-0.3.24/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
11Size (openblas-0.3.24/timing.tgz) = 1059485 bytes 11Size (openblas-0.3.24/timing.tgz) = 1059485 bytes
12SHA1 (patch-Makefile) = 6b1db300b5487fca53e7c41c27b64017658e6375 12SHA1 (patch-Makefile) = 6b1db300b5487fca53e7c41c27b64017658e6375
13SHA1 (patch-Makefile.install) = b4e12a4727a3599f1d63fc134a5db02948136259 13SHA1 (patch-Makefile.install) = b197262f61bd5b1c28ff856b0a54227ab6bee6e8
14SHA1 (patch-Makefile.rule) = 45b6b4576fb521fa093252c63b899d4178a516b6 14SHA1 (patch-Makefile.rule) = 45b6b4576fb521fa093252c63b899d4178a516b6
15SHA1 (patch-Makefile.system) = 6dc9fd85731ca88cb1fdb9063ba3baa31edbcfb8 15SHA1 (patch-Makefile.system) = 6dc9fd85731ca88cb1fdb9063ba3baa31edbcfb8
16SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9 16SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9
17SHA1 (patch-cpuid__arm.c) = 20f95cede90cbe548c0cd09ed2e3d37d1d4aeabd 17SHA1 (patch-cpuid__arm.c) = 20f95cede90cbe548c0cd09ed2e3d37d1d4aeabd
18SHA1 (patch-cpuid_ia64.c) = 39649319b8c0a37b8d494e3c03b1ddb6fb616603 18SHA1 (patch-cpuid_ia64.c) = 39649319b8c0a37b8d494e3c03b1ddb6fb616603
19SHA1 (patch-f_check) = 11f22d0dded9f7b64fb8028693f64fc24f2016a3 19SHA1 (patch-f_check) = 11f22d0dded9f7b64fb8028693f64fc24f2016a3
20SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad 20SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad
cvs diff -r1.5 -r1.6 pkgsrc/math/openblas/patches/patch-Makefile.install (expand / switch to unified diff)

--- pkgsrc/math/openblas/patches/patch-Makefile.install 2023/09/17 08:56:19 1.5
+++ pkgsrc/math/openblas/patches/patch-Makefile.install 2023/10/08 15:41:33 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile.install,v 1.5 2023/09/17 08:56:19 adam Exp $ 1$NetBSD: patch-Makefile.install,v 1.6 2023/10/08 15:41:33 thor Exp $
2 2
3Second part of removing the special library names. 3Second part of removing the special library names.
4Separate options for "install" (needed at least on Darwin). 4Separate options for "install" (needed at least on Darwin).
5 5
6--- Makefile.install.orig 2023-09-03 20:58:32.000000000 +0000 6--- Makefile.install.orig 2023-09-03 20:58:32.000000000 +0000
7+++ Makefile.install 7+++ Makefile.install
8@@ -17,7 +17,7 @@ PKG_EXTRALIB := $(EXTRALIB) 8@@ -17,7 +17,7 @@ PKG_EXTRALIB := $(EXTRALIB)
9 ifeq ($(INTERFACE64),1) 9 ifeq ($(INTERFACE64),1)
10 SUFFIX64=64 10 SUFFIX64=64
11 endif 11 endif
12-PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc" 12-PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
13+PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc" 13+PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
14  14
@@ -81,17 +81,17 @@ Separate options for "install" (needed a @@ -81,17 +81,17 @@ Separate options for "install" (needed a
81 ifeq ($(INTERFACE64),1) 81 ifeq ($(INTERFACE64),1)
82 SUFFIX64=64 82 SUFFIX64=64
83 endif 83 endif
84- PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc" 84- PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBSONAMEBASE)$(SUFFIX64).pc"
85+ PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc" 85+ PKGFILE="$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)/$(LIBNAMEBASE).pc"
86  86
87 @echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)" 87 @echo Generating $(LIBSONAMEBASE)$(SUFFIX64).pc in "$(DESTDIR)$(OPENBLAS_PKGCONFIG_DIR)"
88 @echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)" 88 @echo 'libdir='$(OPENBLAS_LIBRARY_DIR) > "$(PKGFILE)"
89@@ -167,7 +179,7 @@ endif 89@@ -167,7 +179,7 @@ endif
90 @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)" 90 @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)"
91 @echo 'version='$(VERSION) >> "$(PKGFILE)" 91 @echo 'version='$(VERSION) >> "$(PKGFILE)"
92 @echo 'extralib='$(PKG_EXTRALIB) >> "$(PKGFILE)" 92 @echo 'extralib='$(PKG_EXTRALIB) >> "$(PKGFILE)"
93- @cat openblas.pc.in >> "$(PKGFILE)" 93- @cat openblas.pc.in >> "$(PKGFILE)"
94+ @cat openblas.pc.in | sed -e 's,-lopenblas$$,-l$(LIBNAMEBASE),' >> "$(PKGFILE)" 94+ @cat openblas.pc.in | sed -e 's,-lopenblas\b,-l$(LIBNAMEBASE),' >> "$(PKGFILE)"
95  95
96  96
97 #Generating OpenBLASConfig.cmake 97 #Generating OpenBLASConfig.cmake
cvs diff -r1.1 -r1.2 pkgsrc/math/openblas64/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openblas64/Makefile 2021/06/15 04:41:52 1.1
+++ pkgsrc/math/openblas64/Makefile 2023/10/08 15:41:33 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:52 thor Exp $ 1# $NetBSD: Makefile,v 1.2 2023/10/08 15:41:33 thor Exp $
2 2
3MAINTAINER= thomas.orgis@uni-hamburg.de 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4PKGREVISION= 1
4 5
5OPENBLAS_VARIANT= openblas64 6OPENBLAS_VARIANT= openblas64
6.include "../../math/openblas/Makefile.common" 7.include "../../math/openblas/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/math/openblas64_openmp/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openblas64_openmp/Makefile 2021/06/15 04:41:53 1.1
+++ pkgsrc/math/openblas64_openmp/Makefile 2023/10/08 15:41:33 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:53 thor Exp $ 1# $NetBSD: Makefile,v 1.2 2023/10/08 15:41:33 thor Exp $
2 2
3MAINTAINER= thomas.orgis@uni-hamburg.de 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4PKGREVISION= 1
4 5
5OPENBLAS_VARIANT= openblas64_openmp 6OPENBLAS_VARIANT= openblas64_openmp
6.include "../../math/openblas/Makefile.common" 7.include "../../math/openblas/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/math/openblas64_pthread/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openblas64_pthread/Makefile 2021/06/15 04:41:53 1.1
+++ pkgsrc/math/openblas64_pthread/Makefile 2023/10/08 15:41:33 1.2
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.1 2021/06/15 04:41:53 thor Exp $ 1# $NetBSD: Makefile,v 1.2 2023/10/08 15:41:33 thor Exp $
2 2
3MAINTAINER= thomas.orgis@uni-hamburg.de 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4PKGREVISION= 1
4 5
5OPENBLAS_VARIANT= openblas64_pthread 6OPENBLAS_VARIANT= openblas64_pthread
6.include "../../math/openblas/Makefile.common" 7.include "../../math/openblas/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/math/openblas_openmp/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openblas_openmp/Makefile 2023/09/17 08:56:19 1.4
+++ pkgsrc/math/openblas_openmp/Makefile 2023/10/08 15:41:33 1.5
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.4 2023/09/17 08:56:19 adam Exp $ 1# $NetBSD: Makefile,v 1.5 2023/10/08 15:41:33 thor Exp $
2 2
3MAINTAINER= thomas.orgis@uni-hamburg.de 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4PKGREVISION= 1
4 5
5OPENBLAS_VARIANT= openblas_openmp 6OPENBLAS_VARIANT= openblas_openmp
6.include "../../math/openblas/Makefile.common" 7.include "../../math/openblas/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/math/openblas_pthread/Makefile (expand / switch to unified diff)

--- pkgsrc/math/openblas_pthread/Makefile 2023/09/17 08:56:19 1.4
+++ pkgsrc/math/openblas_pthread/Makefile 2023/10/08 15:41:33 1.5
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.4 2023/09/17 08:56:19 adam Exp $ 1# $NetBSD: Makefile,v 1.5 2023/10/08 15:41:33 thor Exp $
2 2
3MAINTAINER= thomas.orgis@uni-hamburg.de 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4PKGREVISION= 1
4 5
5OPENBLAS_VARIANT= openblas_pthread 6OPENBLAS_VARIANT= openblas_pthread
6.include "../../math/openblas/Makefile.common" 7.include "../../math/openblas/Makefile.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"