package/gnutls: Fix build with uClibc
PATCH 1/1 package/gnutls: Fix build with uClibc
From: Stefan S?rensen <[email protected]>
Since v3.6.14 gnutls wants to use the 'e' flag with fopen to set the O_CLOEXEC flags. Since this is a glibc extension, it will trigger a gnulib override of fopen on non-glibc systems, but that override breaks the uClibc stdio.h header.
Fixes:
http://autobuild.buildroot.org/results/02f/02f2b524add307c8f7cc1af1ed0783bb1baf029a
--- ...Fix-gnulib-stdio.h-include-on-uclibc.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch
package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch new file +49 -0
@@ -0,0 +1,49 @@ +From 60fa934ffba3c230040328fdbbbf51f417f12871 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <[email protected]> +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 <[email protected]> +--- + 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 +
Signature · 1 line
2.25.4
PATCH 1/1 package/gnutls: Fix build with uClibc
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"stefan" == stefan <[email protected]> writes:
From: Stefan S?rensen <[email protected]> Since v3.6.14 gnutls wants to use the 'e' flag with fopen to set the
O_CLOEXECflags. Since this is a glibc extension, it will trigger a gnulib override of fopen on non-glibc systems, but that override breaks the uClibcstdio.hheader.
Quoted 4 lines
Fixes:
http://autobuild.buildroot.org/results/02f/02f2b524add307c8f7cc1af1ed0783bb1baf029aSigned-off-by Stefan S?rensen <[email protected]>
Committed to 2020.02.x and 2020.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
Thomas Petazzoni
AppliedPATCH 1/1 package/gnutls: Fix build with uClibc
In reply to stefan at astylos.dkQuoted 7 lines · On Tue, 23 Jun 2020 12:15:33 +0200 stefan at astylos.dk wrote:
From: Stefan S?rensen <[email protected]>
Since v3.6.14 gnutls wants to use the 'e' flag with fopen to set the
O_CLOEXECflags. Since this is a glibc extension, it will trigger a gnulib override of fopen on non-glibc systems, but that override breaks the uClibcstdio.hheader.
Quoted 8 lines
Fixes:
http://autobuild.buildroot.org/results/02f/02f2b524add307c8f7cc1af1ed0783bb1baf029aSigned-off-by Stefan S?rensen <[email protected]>--- ...Fix-gnulib-stdio.h-include-on-uclibc.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/gnutls/0001-Fix-gnulib-stdio.h-include-on-uclibc.patch
This patch was applied to master quite some time ago, but I forgot to notify. Here is the notification! :-)
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com