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,54 @@
|
||||
From 77c89f62f106d88ef2b5963f4a13755c337c793d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 15 Feb 2021 07:56:29 +0100
|
||||
Subject: [PATCH] configure.ac: fix build without threads
|
||||
|
||||
Cross-compilation of libgpg-error fails on toolchain without threads
|
||||
since commit 988211d3d4c1f3d5cfa6b460210f65ab636763b5,
|
||||
9ee011259f819a3cf50fe7019fa4366dbc437e0e and
|
||||
50e62b36ea01ed25d12c443088b85d4f41a2b3e1
|
||||
|
||||
Indeed, since that time, libgpg-error assumes that pthread.h is always
|
||||
available resulting in the following error at configure time:
|
||||
|
||||
checking for arm-unknown-linux-gnueabi-objdump... (cached) /tmp/instance-1/output-1/host/bin/arm-linux-objdump
|
||||
conftest.c:1:10: fatal error: pthread.h: No such file or directory
|
||||
1 | #include <pthread.h>
|
||||
| ^~~~~~~~~~~
|
||||
compilation terminated.
|
||||
configure: generated src/lock-obj-pub.native.h using arm-unknown-linux-gnueabi-objdump and gawk
|
||||
checking whether to enable log_clock... no
|
||||
|
||||
This error will in turn results in a build failure because
|
||||
"Can't determine mutex size" is echoed by gen-lock-obj.sh:
|
||||
|
||||
In file included from strsource-sym.c:27:
|
||||
./gpg-error.h:1115:4: warning: missing terminating ' character
|
||||
1115 | Can't determine mutex size
|
||||
| ^
|
||||
|
||||
Full build log:
|
||||
http://autobuild.buildroot.org/results/334/3344c96e5627a9327b0eabe0b27f34490bbabc0d/build-end.log
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://dev.gnupg.org/T5296]
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b9a2a3e..15d9fdc 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -599,7 +599,7 @@ if test x$cross_compiling = xyes; then
|
||||
case $host in
|
||||
*-*-linux*)
|
||||
AC_CHECK_TOOL(OBJDUMP, [objdump])
|
||||
- if test -n "$OBJDUMP"; then
|
||||
+ if test -n "$OBJDUMP" -a x"$gl_use_threads" != xno; then
|
||||
lock_obj_h_generated=yes
|
||||
if test ! -d src; then mkdir src; fi
|
||||
LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@@ -7,9 +7,9 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
|
||||
BR2_mipsel || BR2_mips64 || BR2_mips64el || \
|
||||
BR2_m68k || BR2_nios2 || BR2_powerpc || \
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \
|
||||
BR2_RISCV_32 || BR2_sh4 || BR2_sh4eb || \
|
||||
BR2_sh4a || BR2_sh4aeb || BR2_sparc || \
|
||||
BR2_sparc64 || BR2_x86_64
|
||||
BR2_RISCV_32 || BR2_s390x || BR2_sh4 || \
|
||||
BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \
|
||||
BR2_sparc || BR2_sparc64 || BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_LIBGPG_ERROR
|
||||
bool "libgpg-error"
|
||||
@@ -44,6 +44,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG
|
||||
if BR2_RISCV_32
|
||||
default "riscv64-unknown-linux-gnu" \
|
||||
if BR2_RISCV_64
|
||||
default "s390x-unknown-linux-gnu" \
|
||||
if BR2_s390x
|
||||
default "sh4-unknown-linux-gnu" \
|
||||
if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
|
||||
default "sparc-unknown-linux-gnu" \
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
# From https://www.gnupg.org/download/integrity_check.html
|
||||
sha1 66d6270511a48bac0bf347330e7a12c62f3a1ab4 libgpg-error-1.41.tar.bz2
|
||||
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.37.tar.bz2.sig
|
||||
# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.41.tar.bz2.sig
|
||||
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
|
||||
sha256 b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763 libgpg-error-1.37.tar.bz2
|
||||
sha256 64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742 libgpg-error-1.41.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
|
||||
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
|
||||
|
||||
@@ -4,15 +4,24 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGPG_ERROR_VERSION = 1.37
|
||||
LIBGPG_ERROR_VERSION = 1.41
|
||||
LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error
|
||||
LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
|
||||
LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+
|
||||
LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
|
||||
LIBGPG_ERROR_CPE_ID_VENDOR = gnupg
|
||||
LIBGPG_ERROR_INSTALL_STAGING = YES
|
||||
LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
|
||||
LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||
LIBGPG_ERROR_CONF_OPTS = --disable-tests \
|
||||
--host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG)
|
||||
# We're patching configure.ac
|
||||
LIBGPG_ERROR_AUTORECONF= YES
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
LIBGPG_ERROR_CONF_OPTS += --enable-threads
|
||||
else
|
||||
LIBGPG_ERROR_CONF_OPTS += --disable-threads
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user