Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
From 7fec3ac22efb86fce90a9edc5696e16ee88a65c7 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Wed, 24 Oct 2018 14:29:45 +0900
|
||||
Subject: [PATCH] build: Don't default to underscore=yes for cross-build.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* acinclude.m4: Don't set ac_cv_sys_symbol_underscore
|
||||
for cross build.
|
||||
|
||||
--
|
||||
|
||||
It made sense in the past when cross compile were basically for a.out
|
||||
system, but nowadays, it's better not to assume that.
|
||||
|
||||
Fetched from: 0f4545b441b6fbdd6e9c4e95f5f2a367483e78ad
|
||||
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
acinclude.m4 | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index fc208c53..6f7789d0 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -111,14 +111,10 @@ case "${host}" in
|
||||
ac_cv_sys_symbol_underscore=yes
|
||||
;;
|
||||
*)
|
||||
- if test "$cross_compiling" = yes; then
|
||||
- if test "x$ac_cv_sys_symbol_underscore" = x ; then
|
||||
- ac_cv_sys_symbol_underscore=yes
|
||||
- fi
|
||||
- else
|
||||
+ if test "$cross_compiling" != yes; then
|
||||
tmp_do_check="yes"
|
||||
fi
|
||||
- ;;
|
||||
+ ;;
|
||||
esac
|
||||
if test "$tmp_do_check" = "yes"; then
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
|
||||
--
|
||||
2.22.0
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
diff --git a/configure b/configure
|
||||
index 70a6d50..8f55d95 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -22306,14 +22306,15 @@ case "${host}" in
|
||||
i386-emx-os2 | i345686-pc-os2*emx | i386-pc-msdosdjgpp)
|
||||
ac_cv_sys_symbol_underscore=yes
|
||||
;;
|
||||
- *)
|
||||
- if test "$cross_compiling" = yes; then
|
||||
- if test "x$ac_cv_sys_symbol_underscore" = x ; then
|
||||
- ac_cv_sys_symbol_underscore=yes
|
||||
+ *)if test -z "$ac_cv_sys_symbol_underscore";then
|
||||
+ if test "$cross_compiling" = yes; then
|
||||
+ if test "x$ac_cv_sys_symbol_underscore" = x ; then
|
||||
+ ac_cv_sys_symbol_underscore=yes
|
||||
+ fi
|
||||
+ else
|
||||
+ tmp_do_check="yes"
|
||||
+ fi
|
||||
fi
|
||||
- else
|
||||
- tmp_do_check="yes"
|
||||
- fi
|
||||
;;
|
||||
esac
|
||||
if test "$tmp_do_check" = "yes"; then
|
||||
@@ -0,0 +1,66 @@
|
||||
From 7fe1b8a53cc8c865c2a10dcd8f6cb4e51ccc6300 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 29 Jul 2019 12:19:10 +0200
|
||||
Subject: [PATCH] configure.ac: add an option to disable tests
|
||||
|
||||
Add an option to allow the user to disable tests, this can be useful for
|
||||
example when the toolchain does not provide thread. Indeed, in this
|
||||
case, libgcrypt fails to build t-lock:
|
||||
|
||||
t-lock.c: In function 'run_test':
|
||||
t-lock.c:359:3: error: unknown type name 'pthread_t'
|
||||
pthread_t rthread;
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/50a8ba572e3fafd3c6a39bd54bcfcaf78b5ad325
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
Makefile.am | 7 ++++++-
|
||||
configure.ac | 10 ++++++++++
|
||||
2 files changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 7fa4fa4d..f0bd90e4 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -39,9 +39,14 @@ else
|
||||
doc =
|
||||
endif
|
||||
|
||||
+if BUILD_TESTS
|
||||
+tests = tests
|
||||
+else
|
||||
+tests =
|
||||
+endif
|
||||
|
||||
DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
|
||||
-SUBDIRS = compat mpi cipher random src $(doc) tests
|
||||
+SUBDIRS = compat mpi cipher random src $(doc) $(tests)
|
||||
|
||||
EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \
|
||||
ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e8c8cd39..1a6b61e5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2710,6 +2710,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
|
||||
AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])
|
||||
|
||||
|
||||
+#
|
||||
+# Option to disable building of tests
|
||||
+#
|
||||
+build_tests=yes
|
||||
+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],
|
||||
+ [do not build tests]),
|
||||
+ build_tests=$enableval, build_tests=yes)
|
||||
+AM_CONDITIONAL([BUILD_TESTS], [test "x$build_tests" != xno])
|
||||
+
|
||||
+
|
||||
#
|
||||
# Provide information about the build.
|
||||
#
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000431.html
|
||||
sha1 4a8ef9db6922f3a31992aca5640b4198a69b58fc libgcrypt-1.8.4.tar.bz2
|
||||
# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000440.html
|
||||
sha1 2d8781e92f88706707a1e76fb628b499ad538a30 libgcrypt-1.8.5.tar.bz2
|
||||
# Locally calculated after checking signature
|
||||
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.4.tar.bz2.sig
|
||||
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.5.tar.bz2.sig
|
||||
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
|
||||
sha256 f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227 libgcrypt-1.8.4.tar.bz2
|
||||
sha256 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 libgcrypt-1.8.5.tar.bz2
|
||||
sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGCRYPT_VERSION = 1.8.4
|
||||
LIBGCRYPT_VERSION = 1.8.5
|
||||
LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
|
||||
LIBGCRYPT_LICENSE = LGPL-2.1+
|
||||
LIBGCRYPT_LICENSE_FILES = COPYING.LIB
|
||||
@@ -13,9 +13,11 @@ LIBGCRYPT_INSTALL_STAGING = YES
|
||||
LIBGCRYPT_DEPENDENCIES = libgpg-error
|
||||
LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config
|
||||
|
||||
LIBGCRYPT_CONF_ENV = \
|
||||
ac_cv_sys_symbol_underscore=no
|
||||
# Patching acinclude.m4 in 0001
|
||||
# Patching configure.ac and Makefile.am in 0002
|
||||
LIBGCRYPT_AUTORECONF = YES
|
||||
LIBGCRYPT_CONF_OPTS = \
|
||||
--disable-tests \
|
||||
--with-gpg-error-prefix=$(STAGING_DIR)/usr
|
||||
|
||||
# Libgcrypt doesn't support assembly for coldfire
|
||||
|
||||
Reference in New Issue
Block a user