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:
Stefan Agner
@@ -0,0 +1,75 @@
|
||||
From af63fe89228172e5a395f7e6491fae3bfa9da4b1 Mon Sep 17 00:00:00 2001
|
||||
From: Jack Lloyd <jack@randombit.net>
|
||||
Date: Mon, 15 Feb 2021 15:01:38 -0500
|
||||
Subject: [PATCH] Add --extra-libs option and group -l flags from LDFLAGS to
|
||||
the end
|
||||
|
||||
Ref #2622
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/randombit/botan/commit/af63fe89228172e5a395f7e6491fae3bfa9da4b1]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.py | 14 ++++++++++++++
|
||||
src/build-data/makefile.in | 2 +-
|
||||
2 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index 73fc0271e9..865a6c8e62 100755
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -333,6 +333,9 @@ def process_command_line(args): # pylint: disable=too-many-locals,too-many-state
|
||||
target_group.add_option('--ldflags', metavar='FLAGS',
|
||||
help='set linker flags', default=None)
|
||||
|
||||
+ target_group.add_option('--extra-libs', metavar='LIBS',
|
||||
+ help='specify extra libraries to link against', default='')
|
||||
+
|
||||
target_group.add_option('--ar-command', dest='ar_command', metavar='AR', default=None,
|
||||
help='set path to static archive creator')
|
||||
|
||||
@@ -2020,6 +2023,12 @@ def choose_cxx_exe():
|
||||
else:
|
||||
return '%s %s' % (options.compiler_cache, cxx)
|
||||
|
||||
+ def extra_libs(libs, cc):
|
||||
+ if libs is None:
|
||||
+ return ''
|
||||
+
|
||||
+ return ' '.join([(cc.add_lib_option % lib) for lib in libs.split(',')])
|
||||
+
|
||||
variables = {
|
||||
'version_major': Version.major(),
|
||||
'version_minor': Version.minor(),
|
||||
@@ -2149,6 +2158,7 @@ def choose_cxx_exe():
|
||||
'cc_sysroot': sysroot_option(),
|
||||
'cc_compile_flags': options.cxxflags or cc.cc_compile_flags(options),
|
||||
'ldflags': options.ldflags or '',
|
||||
+ 'extra_libs': extra_libs(options.extra_libs, cc),
|
||||
'cc_warning_flags': cc.cc_warning_flags(options),
|
||||
'output_to_exe': cc.output_to_exe,
|
||||
'cc_macro': cc.macro_name,
|
||||
@@ -3029,6 +3039,10 @@ def canonicalize_build_targets(options):
|
||||
if options.build_fuzzers == 'libfuzzer' and options.fuzzer_lib is None:
|
||||
options.fuzzer_lib = 'Fuzzer'
|
||||
|
||||
+ if options.ldflags is not None:
|
||||
+ libs = [m.group(1) for m in re.finditer(r'-l([a-z0-9]+)', options.ldflags)]
|
||||
+ options.extra_libs += ','.join(libs)
|
||||
+
|
||||
# Checks user options for consistency
|
||||
# This method DOES NOT change options on behalf of the user but explains
|
||||
# why the given configuration does not work.
|
||||
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
|
||||
index 4692d00f71..82f6576650 100644
|
||||
--- a/src/build-data/makefile.in
|
||||
+++ b/src/build-data/makefile.in
|
||||
@@ -20,7 +20,7 @@ LDFLAGS = %{ldflags}
|
||||
EXE_LINK_CMD = %{exe_link_cmd}
|
||||
|
||||
LIB_LINKS_TO = %{external_link_cmd} %{link_to}
|
||||
-EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO)
|
||||
+EXE_LINKS_TO = %{link_to_botan} $(LIB_LINKS_TO) %{extra_libs}
|
||||
|
||||
BUILD_FLAGS = $(ABI_FLAGS) $(LANG_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From a93bc8503649028852402c61bdda531af2872d0e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 15 Oct 2020 09:15:06 +0200
|
||||
Subject: [PATCH] src/build-data/arch/arm64.txt: add aarch64_be
|
||||
|
||||
Allow the user to set cpu value to aarch64_be.
|
||||
Endianness will be correctly guessed by choose_endian function because
|
||||
this alias ends with "be"
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/69ebf03c59b2af4140a39bc26f17d0396b6ec15d
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/randombit/botan/commit/a93bc8503649028852402c61bdda531af2872d0e]
|
||||
---
|
||||
src/build-data/arch/arm64.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/build-data/arch/arm64.txt b/src/build-data/arch/arm64.txt
|
||||
index 056c5318ff..5205295125 100644
|
||||
--- a/src/build-data/arch/arm64.txt
|
||||
+++ b/src/build-data/arch/arm64.txt
|
||||
@@ -5,6 +5,7 @@ family arm
|
||||
|
||||
<aliases>
|
||||
aarch64
|
||||
+aarch64_be
|
||||
armv8
|
||||
armv8-a
|
||||
</aliases>
|
||||
25
buildroot/package/botan/0002-Avoid-empty-l.patch
Normal file
25
buildroot/package/botan/0002-Avoid-empty-l.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
From 4b2225ea54988e09b649768848b3c14b43e064de Mon Sep 17 00:00:00 2001
|
||||
From: Jack Lloyd <jack@randombit.net>
|
||||
Date: Mon, 15 Feb 2021 15:11:12 -0500
|
||||
Subject: [PATCH] Avoid empty -l
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/randombit/botan/commit/4b2225ea54988e09b649768848b3c14b43e064de]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index 865a6c8e62..a79f672eca 100755
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -2027,7 +2027,7 @@ def extra_libs(libs, cc):
|
||||
if libs is None:
|
||||
return ''
|
||||
|
||||
- return ' '.join([(cc.add_lib_option % lib) for lib in libs.split(',')])
|
||||
+ return ' '.join([(cc.add_lib_option % lib) for lib in libs.split(',') if lib != ''])
|
||||
|
||||
variables = {
|
||||
'version_major': Version.major(),
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://botan.randombit.net/releases/sha256sums.txt
|
||||
sha256 92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628 Botan-2.16.0.tar.xz
|
||||
sha256 79123b654445a4abba486e09a431788545c708237382a3e765664c9f55b03b88 Botan-2.17.3.tar.xz
|
||||
# Locally computed
|
||||
sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt
|
||||
|
||||
@@ -4,11 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOTAN_VERSION = 2.16.0
|
||||
BOTAN_VERSION = 2.17.3
|
||||
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz
|
||||
BOTAN_SITE = http://botan.randombit.net/releases
|
||||
BOTAN_LICENSE = BSD-2-Clause
|
||||
BOTAN_LICENSE_FILES = license.txt
|
||||
BOTAN_CPE_ID_VALID = YES
|
||||
|
||||
BOTAN_INSTALL_STAGING = YES
|
||||
|
||||
@@ -17,14 +18,11 @@ BOTAN_CONF_OPTS = \
|
||||
--os=linux \
|
||||
--cc=gcc \
|
||||
--cc-bin="$(TARGET_CXX)" \
|
||||
--ldflags="$(BOTAN_LDFLAGS)" \
|
||||
--prefix=/usr \
|
||||
--without-documentation
|
||||
|
||||
BOTAN_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
BOTAN_LDFLAGS += -latomic
|
||||
BOTAN_CONF_OPTS += --extra-libs=atomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS),y)
|
||||
|
||||
Reference in New Issue
Block a user