iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch Normal file
View File

@@ -0,0 +1,49 @@
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

8
package/gnutls/gnutls.hash
View File

@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.8.tar.xz.sig
sha256 aa81944e5635de981171772857e72be231a7e0f559ae0292d2737de475383e83 gnutls-3.6.8.tar.xz
# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.15.tar.xz.sig
sha256 0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558 gnutls-3.6.15.tar.xz
# Locally calculated
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER
sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER

4
package/gnutls/gnutls.mk
View File

@@ -5,14 +5,14 @@
################################################################################
GNUTLS_VERSION_MAJOR = 3.6
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).15
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)
GNUTLS_LICENSE_FILES = doc/COPYING.LESSER
ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
GNUTLS_LICENSE := $(GNUTLS_LICENSE), GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES += doc/COPYING
endif