Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
30
buildroot/package/openblas/0001-fix-gfortran-detection.patch
Normal file
30
buildroot/package/openblas/0001-fix-gfortran-detection.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
From ece3ce581e3ec530eaccfe7f284c52e115ec7aa9 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
|
||||
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 <thomas.de_schampheleire@nokia.com>
|
||||
|
||||
|
||||
---
|
||||
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;
|
||||
@@ -73,4 +73,25 @@ config BR2_PACKAGE_OPENBLAS_TARGET
|
||||
string "OpenBLAS target CPU"
|
||||
default BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET
|
||||
|
||||
config BR2_PACKAGE_OPENBLAS_USE_THREAD
|
||||
bool "use multithreading"
|
||||
default y
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
Tell OpenBLAS to use multithreading, by passing USE_THREAD=1.
|
||||
|
||||
config BR2_PACKAGE_OPENBLAS_USE_LOCKING
|
||||
bool "use locking"
|
||||
default y
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_PACKAGE_OPENBLAS_USE_THREAD
|
||||
help
|
||||
Tell OpenBLAS to use locking, by passing USE_LOCKING=1.
|
||||
Locking is implicitly enabled when USE_THREAD=1.
|
||||
However, if USE_THREAD=0 (i.e. OpenBLAS itself will run in
|
||||
single-threaded mode) but an application makes OpenBLAS
|
||||
function calls from multiple threads, then locking is
|
||||
mandatory for correct operation.
|
||||
|
||||
endif
|
||||
|
||||
@@ -25,12 +25,19 @@ OPENBLAS_MAKE_OPTS += ONLY_CBLAS=1
|
||||
endif
|
||||
|
||||
# Enable/Disable multi-threading (not for static-only since it uses dlfcn.h)
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS):$(BR2_STATIC_LIBS),y:)
|
||||
ifeq ($(BR2_PACKAGE_OPENBLAS_USE_THREAD),y)
|
||||
OPENBLAS_MAKE_OPTS += USE_THREAD=1
|
||||
else
|
||||
OPENBLAS_MAKE_OPTS += USE_THREAD=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENBLAS_USE_LOCKING),y)
|
||||
OPENBLAS_MAKE_OPTS += USE_LOCKING=1
|
||||
else
|
||||
# not passing USE_LOCKING=0 as this could be confusing: its effect is implicit
|
||||
# in case of USE_THREAD=1.
|
||||
endif
|
||||
|
||||
# We don't know if OpenMP is available or not, so disable
|
||||
OPENBLAS_MAKE_OPTS += USE_OPENMP=0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user