summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/openblas/Makefile3
-rw-r--r--math/openblas/Makefile.common31
-rw-r--r--math/openblas/distinfo38
-rw-r--r--math/openblas/patches/patch-Makefile62
-rw-r--r--math/openblas/patches/patch-Makefile.install65
-rw-r--r--math/openblas/patches/patch-Makefile.rule17
-rw-r--r--math/openblas/patches/patch-Makefile.system57
-rw-r--r--math/openblas/patches/patch-c_check15
-rw-r--r--math/openblas/patches/patch-cpuid__arm64.c15
-rw-r--r--math/openblas/patches/patch-exports+Makefile14
-rw-r--r--math/openblas/patches/patch-f_check10
-rw-r--r--math/openblas/version.mk6
12 files changed, 165 insertions, 168 deletions
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index 3eab99cb999..65cdce0ded0 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2021/05/24 19:52:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/05/29 19:57:21 thor Exp $
MAINTAINER= thomas.orgis@uni-hamburg.de
OPENBLAS_VARIANT= openblas
-PKGREVISION= 1
.include "../../math/openblas/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/openblas/Makefile.common b/math/openblas/Makefile.common
index 91646649526..6a361e651e5 100644
--- a/math/openblas/Makefile.common
+++ b/math/openblas/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2021/03/25 23:22:35 thor Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/05/29 19:57:21 thor Exp $
#
# used by math/openblas_pthread/Makefile
# used by math/openblas_openmp/Makefile
@@ -73,48 +73,31 @@ MAKE_FLAGS+= OPENBLAS_CMAKE_DIR=${PREFIX}/lib/cmake/${OPENBLAS_VARIANT}
# TODO: Set INTERFACE64=1 with additional OPENBLAS_VARIANTs.
# Need to settle on a convention for SYMBOLSUFFIX first, see
# https://github.com/xianyi/OpenBLAS/issues/646 .
+MAKE_FLAGS+= FIXED_LIBNAME=1
.if ${OPENBLAS_VARIANT} == openblas
MAKE_FLAGS+= USE_OPENMP=0 USE_THREAD=0 USE_LOCKING=1
BENCHMARK_ENV= USE_SIMPLE_THREADED_LEVEL3=1
.elif ${OPENBLAS_VARIANT} == openblas_pthread
+MAKE_FLAGS+= LIBNAMESUFFIX=pthread
+MAKE_FLAGS+= USE_OPENMP=0 USE_THREAD=1
BENCHMARK_ENV= OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
-MAKE_FLAGS+= LIBNAMESUFFIX=pthread USE_OPENMP=0 USE_THREAD=1
.elif ${OPENBLAS_VARIANT} == openblas_openmp
+MAKE_FLAGS+= LIBNAMESUFFIX=openmp
+MAKE_FLAGS+= USE_OPENMP=1 NO_AFFINITY=1
BENCHMARK_ENV= OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
-MAKE_FLAGS+= LIBNAMESUFFIX=openmp USE_OPENMP=1 NO_AFFINITY=1
.endif
-SUBST_CLASSES+= arch
-SUBST_STAGE.arch= pre-build
-SUBST_SED.arch+= -e "s+(ARCH)+(ARCH_)+g"
-SUBST_FILES.arch+= Makefile.tail
-SUBST_FILES.arch+= driver/level3/Makefile
-SUBST_FILES.arch+= driver/others/Makefile
-SUBST_FILES.arch+= exports/Makefile
-SUBST_FILES.arch+= interface/Makefile
-SUBST_FILES.arch+= kernel/Makefile
-SUBST_FILES.arch+= kernel/Makefile.L3
-SUBST_FILES.arch+= lapack/laswp/Makefile
-SUBST_FILES.arch+= reference/Makefile
-SUBST_FILES.arch+= Makefile.system
-
SUBST_CLASSES+= threads
SUBST_STAGE.threads= pre-build
SUBST_SED.threads+= -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g"
SUBST_FILES.threads+= test/Makefile
SUBST_FILES.threads+= ctest/Makefile
-# Fix up pkgconfig file installation.
-SUBST_CLASSES+= pc
-SUBST_STAGE.pc= pre-build
-SUBST_SED.pc+= -e 's+-lopenblas+-l${OPENBLAS_VARIANT}+'
-SUBST_SED.pc+= -e 's+openblas.pc"+${OPENBLAS_VARIANT}.pc"+'
-SUBST_FILES.pc+= Makefile.install openblas.pc.in
-
PLIST_SRC= ${.CURDIR}/../../math/openblas/PLIST
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})
diff --git a/math/openblas/distinfo b/math/openblas/distinfo
index 7e74cd9f0fa..aeeaf0d9b04 100644
--- a/math/openblas/distinfo
+++ b/math/openblas/distinfo
@@ -1,26 +1,24 @@
-$NetBSD: distinfo,v 1.2 2021/03/25 23:22:35 thor Exp $
+$NetBSD: distinfo,v 1.3 2021/05/29 19:57:21 thor Exp $
-SHA1 (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = cbe3fdd0e6ee235debc611d76976dac62f3ddc1c
-RMD160 (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = 031ed30a7934655dcbeb26d9d71f8e9ec3094a55
-SHA512 (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = 64a5f983b2f6e02cdb6e0f14433498cc5daa1ccfb49246f7a2dcd38f9982fa608f2abea069fe0e35012af8c1441c43d1f6418eaccd40795f5002fed1c36ce05d
-Size (openblas-0.3.10/OpenBLAS-0.3.10.tar.gz) = 12246979 bytes
-SHA1 (openblas-0.3.10/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
-RMD160 (openblas-0.3.10/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
-SHA512 (openblas-0.3.10/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
-Size (openblas-0.3.10/large.tgz) = 2595 bytes
-SHA1 (openblas-0.3.10/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
-RMD160 (openblas-0.3.10/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
-SHA512 (openblas-0.3.10/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
-Size (openblas-0.3.10/timing.tgz) = 1059485 bytes
-SHA1 (patch-Makefile) = 91690ebbbe3acc0c4339120c752dfa22952db9eb
-SHA1 (patch-Makefile.install) = 8d4320114f66dd6fabaec94c9710ebc5b7b49d39
-SHA1 (patch-Makefile.system) = 4a0267b3181230cae4575041070fc30186355e0a
-SHA1 (patch-c_check) = c5990809434a259399c75e660aad5abe83899548
+SHA1 (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = d7d1f67c1ef0c14c93761bdf44f0da8d0dd4bc0f
+RMD160 (openblas-0.3.15/OpenBLAS-0.3.15.tar.gz) = b740a744c0405d036c39ee5224b7d18f542db788
+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
+SHA1 (openblas-0.3.15/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
+RMD160 (openblas-0.3.15/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
+SHA512 (openblas-0.3.15/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
+Size (openblas-0.3.15/large.tgz) = 2595 bytes
+SHA1 (openblas-0.3.15/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
+RMD160 (openblas-0.3.15/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
+SHA512 (openblas-0.3.15/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
+Size (openblas-0.3.15/timing.tgz) = 1059485 bytes
+SHA1 (patch-Makefile) = 6b1db300b5487fca53e7c41c27b64017658e6375
+SHA1 (patch-Makefile.install) = eadba533232b2bf7c6ab5e4efe0db9206f35011d
+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__arm64.c) = bbeb7222b32ec821511a6798fc27ff7269700662
SHA1 (patch-cpuid_ia64.c) = 39649319b8c0a37b8d494e3c03b1ddb6fb616603
-SHA1 (patch-exports+Makefile) = 03f5b3cc41d215a961bb4d1dd197d72f8ddaadbc
-SHA1 (patch-f_check) = 9162d6a31f96c6af5aada82f6e78cf0385384215
+SHA1 (patch-f_check) = 9181958ddd7dca16f28b1144ce7f400b5ab36301
SHA1 (patch-getarch.c) = 0cf098b7203586206df95b24d1e95b0b5b9fd500
SHA1 (patch-interface__ztrmv.c) = 6038946f8fb9542e680178ece2bd0d0d5853baad
diff --git a/math/openblas/patches/patch-Makefile b/math/openblas/patches/patch-Makefile
index dcfe1d2d214..fdfebd9f977 100644
--- a/math/openblas/patches/patch-Makefile
+++ b/math/openblas/patches/patch-Makefile
@@ -1,63 +1,83 @@
-$NetBSD: patch-Makefile,v 1.2 2021/03/25 23:22:35 thor Exp $
+$NetBSD: patch-Makefile,v 1.3 2021/05/29 19:57:21 thor Exp $
Remove special library names.
---- Makefile.orig 2020-06-14 20:03:04.000000000 +0000
+--- Makefile.orig 2021-05-02 21:50:22.000000000 +0000
+++ Makefile
-@@ -115,7 +115,6 @@ ifneq ($(NO_SHARED), 1)
+@@ -120,18 +120,28 @@ shared :
+ ifneq ($(NO_SHARED), 1)
ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android Haiku FreeBSD DragonFly))
@$(MAKE) -C exports so
++ifneq ($(LIBSONAME), $(LIBPREFIX).so)
@ln -fs $(LIBSONAME) $(LIBPREFIX).so
-- @ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
++endif
++ifneq ($(LIBSONAME), $(LIBPREFIX).so.$(MAJOR_VERSION))
+ @ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
endif
++endif
ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
@$(MAKE) -C exports so
-@@ -123,8 +122,6 @@ ifeq ($(OSNAME), $(filter $(OSNAME),Open
++ifneq ($(LIBSONAME), $(LIBPREFIX).so)
+ @ln -fs $(LIBSONAME) $(LIBPREFIX).so
endif
++endif
ifeq ($(OSNAME), Darwin)
@$(MAKE) -C exports dyn
-- @ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
-- @ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
++ifneq ($(LIBDYNNAME), $(LIBPREFIX).dylib)
+ @ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
++endif
++ifneq ($(LIBDYNNAME), $(LIBPREFIX).$(MAJOR_VERSION).dylib)
+ @ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
endif
++endif
ifeq ($(OSNAME), WINNT)
@$(MAKE) -C exports dll
-@@ -161,7 +158,6 @@ ifeq ($(NO_SHARED), 1)
- $(error OpenBLAS: neither static nor shared are enabled.)
endif
+@@ -195,13 +205,17 @@ endif
+ ifdef USE_THREAD
+ @echo USE_THREAD=$(USE_THREAD) >> Makefile.conf_last
endif
-- @-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
- @for d in $(SUBDIRS) ; \
- do if test -d $$d; then \
- $(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -195,7 +191,6 @@ endif
++ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
+ @-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++endif
+ @touch lib.grd
+
prof : prof_blas prof_lapack
prof_blas :
-- ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
++ifneq ($(LIBNAME_P), $(LIBPREFIX)_p.$(LIBSUFFIX))
+ ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
++endif
for d in $(SUBDIRS) ; \
do if test -d $$d; then \
$(MAKE) -C $$d prof || exit 1 ; \
-@@ -206,7 +201,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
+@@ -212,7 +226,9 @@ ifeq ($(DYNAMIC_ARCH), 1)
endif
blas :
-- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
+ ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++endif
for d in $(BLASDIRS) ; \
do if test -d $$d; then \
$(MAKE) -C $$d libs || exit 1 ; \
-@@ -214,7 +208,6 @@ blas :
+@@ -220,7 +236,9 @@ blas :
done
hpl :
-- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
+ ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++endif
for d in $(BLASDIRS) ../laswp exports ; \
do if test -d $$d; then \
$(MAKE) -C $$d $(@F) || exit 1 ; \
-@@ -228,7 +221,6 @@ ifeq ($(DYNAMIC_ARCH), 1)
+@@ -234,7 +252,9 @@ ifeq ($(DYNAMIC_ARCH), 1)
endif
hpl_p :
-- ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
++ifneq ($(LIBNAME_P), $(LIBPREFIX)_p.$(LIBSUFFIX))
+ ln -fs $(LIBNAME_P) $(LIBPREFIX)_p.$(LIBSUFFIX)
++endif
for d in $(SUBDIRS) ../laswp exports ; \
do if test -d $$d; then \
$(MAKE) -C $$d $(@F) || exit 1 ; \
diff --git a/math/openblas/patches/patch-Makefile.install b/math/openblas/patches/patch-Makefile.install
index a43cab00eb2..2cf3d89a2ed 100644
--- a/math/openblas/patches/patch-Makefile.install
+++ b/math/openblas/patches/patch-Makefile.install
@@ -1,35 +1,57 @@
-$NetBSD: patch-Makefile.install,v 1.2 2021/03/25 23:22:35 thor Exp $
+$NetBSD: patch-Makefile.install,v 1.3 2021/05/29 19:57:21 thor Exp $
Second part of removing the special library names.
---- Makefile.install.orig 2020-06-14 20:03:04.000000000 +0000
+--- Makefile.install.orig 2021-05-02 21:50:22.000000000 +0000
+++ Makefile.install
-@@ -62,8 +62,6 @@ endif
+@@ -85,29 +85,35 @@ endif
ifneq ($(NO_STATIC),1)
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
@install -pm644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
-- @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
-- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
+ @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
+ ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
endif
++endif
#for install shared library
ifneq ($(NO_SHARED),1)
-@@ -71,8 +69,7 @@ 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)"
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
- ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
- ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
-+ ln -fs $(LIBSONAME) $(LIBPREFIX).so
++ 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
endif
ifeq ($(OSNAME), $(filter $(OSNAME),OpenBSD NetBSD))
-@@ -112,16 +109,13 @@ endif
+ @cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
++ifneq ($(LIBSONAME), $(LIBPREFIX).so)
+ @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
+ ln -fs $(LIBSONAME) $(LIBPREFIX).so
+ endif
++endif
+ ifeq ($(OSNAME), Darwin)
+ @-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 ; \
+ ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
+ endif
+ ifeq ($(OSNAME), WINNT)
+@@ -135,28 +141,32 @@ endif
ifneq ($(NO_STATIC),1)
@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
@installbsd -c -m 644 $(LIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
-- @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
-- ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
++ifneq ($(LIBNAME), $(LIBPREFIX).$(LIBSUFFIX))
+ @cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
+ ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
endif
++endif
#for install shared library
ifneq ($(NO_SHARED),1)
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
@@ -37,7 +59,28 @@ Second part of removing the special library names.
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
- ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
- ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
-+ ln -fs $(LIBSONAME) $(LIBPREFIX).so
++ 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
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"
+
+
+ #Generating OpenBLASConfig.cmake
diff --git a/math/openblas/patches/patch-Makefile.rule b/math/openblas/patches/patch-Makefile.rule
new file mode 100644
index 00000000000..fa90cf26130
--- /dev/null
+++ b/math/openblas/patches/patch-Makefile.rule
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile.rule,v 1.1 2021/05/29 19:57:21 thor Exp $
+
+Stable library names, determined by our choice only.
+
+--- Makefile.rule.orig 2021-05-02 21:50:22.000000000 +0000
++++ Makefile.rule
+@@ -10,6 +10,10 @@ VERSION = 0.3.15
+ # is libopenblas_$(LIBNAMESUFFIX).so.0.
+ # LIBNAMESUFFIX = omp
+
++# Set this to cause the primary library name be actually ruled by the above,
++# not just a symlink to a library name determined by chosen CPU etc.
++# FIXED_LIBNAME = 1
++
+ # You can specify the target architecture, otherwise it's
+ # automatically detected.
+ # TARGET = PENRYN
diff --git a/math/openblas/patches/patch-Makefile.system b/math/openblas/patches/patch-Makefile.system
index ddc76e70b30..572653900ad 100644
--- a/math/openblas/patches/patch-Makefile.system
+++ b/math/openblas/patches/patch-Makefile.system
@@ -1,52 +1,35 @@
-$NetBSD: patch-Makefile.system,v 1.2 2021/03/25 23:22:35 thor Exp $
+$NetBSD: patch-Makefile.system,v 1.3 2021/05/29 19:57:21 thor Exp $
-Fully control the library name via LIBNAMESUFFIX
-And a bit of ARCH_
+Stable library names, determined by our choice only.
---- Makefile.system.orig 2020-06-14 20:03:04.000000000 +0000
+--- Makefile.system.orig 2021-05-02 21:50:22.000000000 +0000
+++ Makefile.system
-@@ -1326,31 +1326,15 @@ ifndef LIBSUFFIX
+@@ -1510,6 +1510,10 @@ ifndef LIBSUFFIX
LIBSUFFIX = a
endif
--ifneq ($(DYNAMIC_ARCH), 1)
--ifndef SMP
--LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
--LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
--else
--LIBNAME = $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
--endif
--else
--ifndef SMP
--LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
--LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
--else
--LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
--LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
--endif
--endif
--
++ifeq ($(FIXED_LIBNAME), 1)
+LIBNAME = $(LIBPREFIX).$(LIBSUFFIX)
+LIBNAME_P = $(LIBPREFIX)_p.$(LIBSUFFIX)
++else
+ ifneq ($(DYNAMIC_ARCH), 1)
+ ifndef SMP
+ LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
+@@ -1527,12 +1531,16 @@ LIBNAME = $(LIBPREFIX)p$(REVISION).$(LI
+ LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
+ endif
+ endif
+-
++endif
LIBDLLNAME = $(LIBPREFIX).dll
IMPLIBNAME = lib$(LIBNAMEBASE).dll.a
ifneq ($(OSNAME), AIX)
--LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
++ifeq ($(FIXED_LIBNAME), 1)
+LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so).$(MAJOR_VERSION)
++else
+ LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
++endif
else
--LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.a)
-+LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.a).$(MAJOR_VERSION)
- endif
- LIBDYNNAME = $(LIBNAME:.$(LIBSUFFIX)=.dylib)
- LIBDEFNAME = $(LIBNAME:.$(LIBSUFFIX)=.def)
-@@ -1381,7 +1365,7 @@ LIB_COMPONENTS = CBLAS
+ LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.a)
endif
-
- export OSNAME
--export ARCH
-+export ARCH_
- export CORE
- export LIBCORE
- export __BYTE_ORDER__
diff --git a/math/openblas/patches/patch-c_check b/math/openblas/patches/patch-c_check
deleted file mode 100644
index 271ea082cdb..00000000000
--- a/math/openblas/patches/patch-c_check
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-c_check,v 1.1 2020/11/05 16:31:45 bacon Exp $
-
-Avoid name collision on ARCH
-
---- c_check.orig 2015-10-27 20:44:50 UTC
-+++ c_check
-@@ -235,7 +235,7 @@ open(CONFFILE, "> $config" ) || die "Ca
- # print $data, "\n";
-
- print MAKEFILE "OSNAME=$os\n";
--print MAKEFILE "ARCH=$architecture\n";
-+print MAKEFILE "ARCH_=$architecture\n";
- print MAKEFILE "C_COMPILER=$compiler\n";
- print MAKEFILE "BINARY32=\n" if $binformat ne bin32;
- print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
diff --git a/math/openblas/patches/patch-cpuid__arm64.c b/math/openblas/patches/patch-cpuid__arm64.c
deleted file mode 100644
index 35ec85dc4a6..00000000000
--- a/math/openblas/patches/patch-cpuid__arm64.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-cpuid__arm64.c,v 1.1 2020/11/05 16:31:45 bacon Exp $
-
-Add default arm processor type
-
---- 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;
diff --git a/math/openblas/patches/patch-exports+Makefile b/math/openblas/patches/patch-exports+Makefile
deleted file mode 100644
index 8db92d7f873..00000000000
--- a/math/openblas/patches/patch-exports+Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-exports+Makefile,v 1.2 2021/03/25 23:22:35 thor Exp $
-
-Improve dynamic lib naming
-
---- exports/Makefile.orig 2020-06-14 20:03:04.000000000 +0000
-+++ exports/Makefile
-@@ -192,6 +192,7 @@ else
- endif
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
- -Wl,--whole-archive $< -Wl,--no-whole-archive \
-+ -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
- $(FEXTRALIB) $(EXTRALIB)
- $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
- rm -f linktest
diff --git a/math/openblas/patches/patch-f_check b/math/openblas/patches/patch-f_check
index f78a7bc636e..c5592bd9566 100644
--- a/math/openblas/patches/patch-f_check
+++ b/math/openblas/patches/patch-f_check
@@ -1,10 +1,10 @@
-$NetBSD: patch-f_check,v 1.1 2020/11/05 16:31:45 bacon Exp $
+$NetBSD: patch-f_check,v 1.2 2021/05/29 19:57:21 thor Exp $
Clean up link flags
---- f_check.orig 2015-10-27 20:44:50 UTC
+--- f_check.orig 2021-05-02 21:50:22.000000000 +0000
+++ f_check
-@@ -261,7 +261,7 @@ if ($link ne "") {
+@@ -326,7 +326,7 @@ if ($link ne "") {
foreach $flags (@flags) {
if (
@@ -13,12 +13,12 @@ Clean up link flags
&& ($flags !~ /^-LIST:/)
&& ($flags !~ /^-LANG:/)
) {
-@@ -292,7 +292,7 @@ if ($link ne "") {
+@@ -358,7 +358,7 @@ if ($link ne "") {
}
if (
- ($flags =~ /^\-l/)
+ ($flags =~ /^\-l\S/)
+ && ($flags !~ /ibrary/)
&& ($flags !~ /gfortranbegin/)
&& ($flags !~ /frtbegin/)
- && ($flags !~ /pathfstart/)
diff --git a/math/openblas/version.mk b/math/openblas/version.mk
index 9a2d6c50a20..2e0855b44cb 100644
--- a/math/openblas/version.mk
+++ b/math/openblas/version.mk
@@ -1,5 +1,3 @@
-# $NetBSD: version.mk,v 1.2 2021/03/25 23:22:35 thor Exp $
+# $NetBSD: version.mk,v 1.3 2021/05/29 19:57:21 thor Exp $
-# Intentionally not 0.3.12, as that has build issues
-# on Ivy Bridge. 0.3.13 should be fine.
-OPENBLAS_VERSION= 0.3.10
+OPENBLAS_VERSION= 0.3.15
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-27 12:09:52 +0000