summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Clausecker <fuz@FreeBSD.org>2023-10-10 13:08:35 -0400
committerRobert Clausecker <fuz@FreeBSD.org>2023-10-10 13:18:46 -0400
commit3854b733b246f077a2a6efbb3c58cb8be7297615 (patch)
tree82b063245356fa745151752f6846df3ecb513840
parentnet-im/signal-desktop: Update to 6.32.0 (diff)
math/openblas: Revert "update to 0.3.24"release/14.0.0
On some amd64 CPUs, this change broke py-scipy during configure, and octave at runtime. In the end, octave kills the package builders. This reverts commit c45681ef5049357ef58d738865b821186b02578f. Approved by: portmgr (antoine) PR: 273219 MFH: 2023Q4 (cherry picked from commit 2c83bd52e56ebe097db15d592401cab28f9f126a)
-rw-r--r--math/openblas/Makefile4
-rw-r--r--math/openblas/distinfo6
-rw-r--r--math/openblas/files/patch-c_check11
-rw-r--r--math/openblas/files/patch-common__arm.h4
-rw-r--r--math/openblas/files/patch-exports_Makefile4
-rw-r--r--math/openblas/files/patch-f_check45
6 files changed, 47 insertions, 27 deletions
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index f85ecbb268fa..e4104ba6f50d 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -1,7 +1,7 @@
PORTNAME= openblas
DISTVERSIONPREFIX= v
-DISTVERSION= 0.3.24
-PORTEPOCH= 1
+DISTVERSION= 0.3.20
+PORTEPOCH= 2
CATEGORIES= math
MASTER_SITES= NL/lapack/timing/:lapack_tmg
DISTFILES= large.tgz:lapack_tmg \
diff --git a/math/openblas/distinfo b/math/openblas/distinfo
index e4ffec3fd9c0..65d0da9523f3 100644
--- a/math/openblas/distinfo
+++ b/math/openblas/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1694493901
+TIMESTAMP = 1648345083
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
SIZE (openblas/large.tgz) = 2595
SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
SIZE (openblas/timing.tgz) = 1059485
-SHA256 (openblas/xianyi-OpenBLAS-v0.3.24_GH0.tar.gz) = ceadc5065da97bd92404cac7254da66cc6eb192679cf1002098688978d4d5132
-SIZE (openblas/xianyi-OpenBLAS-v0.3.24_GH0.tar.gz) = 24263037
+SHA256 (openblas/xianyi-OpenBLAS-v0.3.20_GH0.tar.gz) = 8495c9affc536253648e942908e88e097f2ec7753ede55aca52e5dead3029e3c
+SIZE (openblas/xianyi-OpenBLAS-v0.3.20_GH0.tar.gz) = 12742441
diff --git a/math/openblas/files/patch-c_check b/math/openblas/files/patch-c_check
new file mode 100644
index 000000000000..817371d8f62f
--- /dev/null
+++ b/math/openblas/files/patch-c_check
@@ -0,0 +1,11 @@
+--- c_check.orig 2019-04-29 17:22:19 UTC
++++ c_check
+@@ -320,7 +320,7 @@ open(CONFFILE, "> $config" ) || die "Can't create $co
+ # 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/files/patch-common__arm.h b/math/openblas/files/patch-common__arm.h
index 1ffd13a2c63b..7c6e402278e2 100644
--- a/math/openblas/files/patch-common__arm.h
+++ b/math/openblas/files/patch-common__arm.h
@@ -1,6 +1,6 @@
---- common_arm.h.orig 2023-04-01 20:18:01 UTC
+--- common_arm.h.orig 2018-08-30 22:07:48 UTC
+++ common_arm.h
-@@ -95,6 +95,17 @@ static inline int blas_quickdivide(blasint x, blasint
+@@ -93,6 +93,17 @@ static inline int blas_quickdivide(blasint x, blasint
#endif
diff --git a/math/openblas/files/patch-exports_Makefile b/math/openblas/files/patch-exports_Makefile
index 7e7692de9ce0..26dccbab2baf 100644
--- a/math/openblas/files/patch-exports_Makefile
+++ b/math/openblas/files/patch-exports_Makefile
@@ -1,6 +1,6 @@
---- exports/Makefile.orig 2023-04-01 20:18:01 UTC
+--- exports/Makefile.orig 2019-08-11 21:23:27 UTC
+++ exports/Makefile
-@@ -222,7 +222,7 @@ else
+@@ -184,7 +184,7 @@ else
endif
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
-Wl,--whole-archive $< -Wl,--no-whole-archive \
diff --git a/math/openblas/files/patch-f_check b/math/openblas/files/patch-f_check
index 5af156564f03..6636f3cdeab3 100644
--- a/math/openblas/files/patch-f_check
+++ b/math/openblas/files/patch-f_check
@@ -1,19 +1,28 @@
---- f_check.orig 2023-04-01 20:18:01 UTC
-+++ f_check
-@@ -360,6 +360,16 @@ if [ -n "$link" ]; then
- flag="-lomp"
- ;;
- esac
-+
-+ case "$hostos" in "FreeBSD")
-+ case "$CC" in
-+ gcc*) ;;
-+ *)
-+ # clang is assumed
-+ flag="-lomp"
-+ ;;
-+ esac
-+ esac
- esac
+--- f_check.orig 2021-05-03 06:50:22.000000000 +0900
++++ f_check 2021-05-06 23:42:10.192934000 +0900
+@@ -326,7 +326,7 @@
- case "$flag" in -l*)
+ foreach $flags (@flags) {
+ if (
+- ($flags =~ /^\-L/)
++ ($flags =~ /^\-L\S/)
+ && ($flags !~ /^-LIST:/)
+ && ($flags !~ /^-LANG:/)
+ ) {
+@@ -358,7 +358,7 @@
+ }
+
+ if (
+- ($flags =~ /^\-l/)
++ ($flags =~ /^\-l\S/)
+ && ($flags !~ /ibrary/)
+ && ($flags !~ /gfortranbegin/)
+ && ($flags !~ /frtbegin/)
+@@ -369,6 +369,7 @@
+ && ($flags !~ /kernel32/)
+ && ($flags !~ /advapi32/)
+ && ($flags !~ /shell32/)
++ && ($flags !~ /gomp/)
+ && ($flags !~ /omp/ || ($vendor !~ /PGI/ && $vendor !~ /FUJITSU/ && $flags =~ /omp/))
+ && ($flags !~ /[0-9]+/ || ($vendor == FUJITSU && $flags =~ /^-lfj90/))
+ && ($flags !~ /^\-l$/)