From 54d962b7685c98b7975ad4db61e11b329a5dba58 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 14 Dec 2021 23:44:13 +0100 Subject: [PATCH] package/openblas: bump to version 0.3.18 Drop first and second patches (already in version) https://github.com/xianyi/OpenBLAS/blob/v0.3.18/Changelog.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...sider-Os-when-determining-LAPACK_NO.patch} | 0 .../0001-fix-gfortran-detection.patch | 30 ------------ ...port-for-passing-FFLAGS-on-the-make-.patch | 47 ------------------- ...on-t-specify-optimization-level-bui.patch} | 0 package/openblas/openblas.hash | 2 +- package/openblas/openblas.mk | 4 +- 6 files changed, 3 insertions(+), 80 deletions(-) rename package/openblas/{0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch => 0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch} (100%) delete mode 100644 package/openblas/0001-fix-gfortran-detection.patch delete mode 100644 package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch rename package/openblas/{0004-Makefile.system-don-t-specify-optimization-level-bui.patch => 0002-Makefile.system-don-t-specify-optimization-level-bui.patch} (100%) diff --git a/package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch similarity index 100% rename from package/openblas/0003-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch rename to package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch diff --git a/package/openblas/0001-fix-gfortran-detection.patch b/package/openblas/0001-fix-gfortran-detection.patch deleted file mode 100644 index 1fecdac3e5..0000000000 --- a/package/openblas/0001-fix-gfortran-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001 -From: Martin Kroeker -Date: Wed, 10 Feb 2021 14:22:59 +0100 -Subject: [PATCH] Strip parenthesized (pkgversion) data from GCC version string - to avoid misinterpretation - -See https://github.com/xianyi/OpenBLAS/issues/3099 for details. - -Upstream-status: backport - -[for import into Buildroot] -Signed-off-by: Thomas De Schampheleire - - ---- - f_check | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/f_check b/f_check -index e9aca4ff9..ffe9c6b46 100644 ---- a/f_check -+++ b/f_check -@@ -75,6 +75,7 @@ if ($compiler eq "") { - - } elsif ($data =~ /GNU/ || $data =~ /GCC/ ) { - -+ $data =~ s/\(+.*?\)+//g; - $data =~ /(\d+)\.(\d+).(\d+)/; - $major = $1; - $minor = $2; diff --git a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch b/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch deleted file mode 100644 index 72b387b93e..0000000000 --- a/package/openblas/0002-Makefile-fix-support-for-passing-FFLAGS-on-the-make-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4d3829fa52240c2b7e48770ab19584db33ba7863 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:17:59 +0100 -Subject: [PATCH] Makefile: fix support for passing FFLAGS on the make - command line - -When openblas is built while passing FFLAGS on the make command line, the -compilation of lapack objects will not contain the flags specified in -Makefile but _only_ those passed in FFLAGS. - -This can lead to build failure, e.g. because -fPIC is not passed to the -compilation of most lapack objects, but is given to the link command: - -.../buildroot/output/host/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -O2 -DMAX_STACK_ALLOC=2048 -Wall -m64 -DF_INTERFACE_GFORT -fPIC -DNO_WARMUP -DMAX_CPU_NUMBER=4 -DMAX_PARALLEL_NUMBER=1 -DVERSION=\"0.3.9\" -DASMNAME= -DASMFNAME=_ -DNAME=_ -DCNAME= -DCHAR_NAME=\"_\" -DCHAR_CNAME=\"\" -DNO_AFFINITY -I.. -shared -o ../libopenblas_nehalem-r0.3.9.so \ --Wl,--whole-archive ../libopenblas_nehalem-r0.3.9.a -Wl,--no-whole-archive \ --Wl,-soname,libopenblas.so.0 -lm -lgfortran -lm -lgfortran -.../buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/9.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: ../libopenblas_nehalem-r0.3.9.a(sbdsvdx.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC - -In the initial support for this principle, added in commit -d0e731e8b825e7a554f245aa8f1118dcec9e2728, the flags specified in the -makefile were appended to the flags specified on the command-line. - -Fix this situation by using 'override' for 'FFLAGS' in -lapack-netlib/make.inc. The flags passed on the command-line are already -part of the LAPACK_FFLAGS variable, so no '+=' is needed here. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index fc5fe3f5..8ae1ff47 100644 ---- a/Makefile -+++ b/Makefile -@@ -248,7 +248,7 @@ prof_lapack : lapack_prebuild - lapack_prebuild : - ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN))) - -@echo "FC = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc -- -@echo "FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc -+ -@echo "override FFLAGS = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "POPTS = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "FFLAGS_NOOPT = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc - -@echo "PNOOPT = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc --- -2.26.2 - diff --git a/package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch similarity index 100% rename from package/openblas/0004-Makefile.system-don-t-specify-optimization-level-bui.patch rename to package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index c58def9d5d..a1e35f4fc4 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d4677264dfbc4433e97076220adc79b050e4f8a083ea3f853a53af253bc380 openblas-0.3.9.tar.gz +sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 60b9d9b15b..4d506fa618 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.9 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION)) +OPENBLAS_VERSION = 0.3.18 +OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES