Update buildroot to 2021.02.1 (#1312)
Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
@@ -1,49 +0,0 @@
|
||||
From 60fa934ffba3c230040328fdbbbf51f417f12871 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
|
||||
Date: Mon, 22 Jun 2020 14:11:05 +0200
|
||||
Subject: [PATCH] Fix gnulib stdio.h include on uclibc
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The __need_FILE define used by gnulib interferes with the uClibc stdio.h
|
||||
header, so move the inclusion the stdio.h to after __need_FILE has been
|
||||
undefined again.
|
||||
|
||||
Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
|
||||
---
|
||||
gl/fopen.c | 2 +-
|
||||
src/gl/fopen.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gl/fopen.c b/gl/fopen.c
|
||||
index 8d6625a..248692c 100644
|
||||
--- a/gl/fopen.c
|
||||
+++ b/gl/fopen.c
|
||||
@@ -23,8 +23,8 @@
|
||||
#include <config.h>
|
||||
|
||||
/* Get the original definition of fopen. It might be defined as a macro. */
|
||||
-#include <stdio.h>
|
||||
#undef __need_FILE
|
||||
+#include <stdio.h>
|
||||
|
||||
static FILE *
|
||||
orig_fopen (const char *filename, const char *mode)
|
||||
diff --git a/src/gl/fopen.c b/src/gl/fopen.c
|
||||
index 47d7f19..1f22f4f 100644
|
||||
--- a/src/gl/fopen.c
|
||||
+++ b/src/gl/fopen.c
|
||||
@@ -23,8 +23,8 @@
|
||||
#include <config.h>
|
||||
|
||||
/* Get the original definition of fopen. It might be defined as a macro. */
|
||||
-#include <stdio.h>
|
||||
#undef __need_FILE
|
||||
+#include <stdio.h>
|
||||
|
||||
static FILE *
|
||||
orig_fopen (const char *filename, const char *mode)
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@@ -23,8 +23,6 @@ config BR2_PACKAGE_GNUTLS_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_GNUTLS_TOOLS
|
||||
bool "install tools"
|
||||
select BR2_PACKAGE_ARGP_STANDALONE \
|
||||
if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
|
||||
help
|
||||
Install GnuTLS command line tools for various cryptographic
|
||||
tasks.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.15.tar.xz.sig
|
||||
sha256 0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558 gnutls-3.6.15.tar.xz
|
||||
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.1.tar.xz.sig
|
||||
sha256 3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f gnutls-3.7.1.tar.xz
|
||||
# Locally calculated
|
||||
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUTLS_VERSION_MAJOR = 3.6
|
||||
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).15
|
||||
GNUTLS_VERSION_MAJOR = 3.7
|
||||
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1
|
||||
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
|
||||
GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
|
||||
GNUTLS_LICENSE = LGPL-2.1+ (core library)
|
||||
@@ -47,20 +47,6 @@ GNUTLS_CONF_OPTS += \
|
||||
--with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
|
||||
--with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
|
||||
|
||||
# Consider crywrap as part of tools because it needs WCHAR, and it's so too
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),)
|
||||
GNUTLS_CONF_OPTS += --disable-crywrap
|
||||
endif
|
||||
|
||||
# Prerequisite for crywrap
|
||||
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
|
||||
GNUTLS_LIBS += -largp
|
||||
GNUTLS_DEPENDENCIES += argp-standalone
|
||||
endif
|
||||
|
||||
# libidn support for nommu must exclude the crywrap wrapper (uses fork)
|
||||
GNUTLS_CONF_OPTS += $(if $(BR2_USE_MMU),,--disable-crywrap)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
|
||||
GNUTLS_CONF_OPTS += --enable-cryptodev
|
||||
GNUTLS_DEPENDENCIES += cryptodev-linux
|
||||
|
||||
Reference in New Issue
Block a user