[03/21] nettle: Fix build with GCC-15

Message ID	20250324-b4-musl-gcc15-v1-3-ca68c03c5b01@gmail.com
State	Accepted, archived
Commit	2379010dfecffedc8d4253a03d5cb348f17ecee9
Headers	show Return-Path: <raj.khem@gmail.com> ip: 209.85.214.170, mailfrom: raj.khem@gmail.com) From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Mar 2025 09:33:24 -0700 Subject: [PATCH 03/21] nettle: Fix build with GCC-15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250324-b4-musl-gcc15-v1-3-ca68c03c5b01@gmail.com> References: <20250324-b4-musl-gcc15-v1-0-ca68c03c5b01@gmail.com> In-Reply-To: <20250324-b4-musl-gcc15-v1-0-ca68c03c5b01@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Khem Raj <raj.khem@gmail.com>
Series	musl/gcc-15: Fix packages to build with gcc15 on musl platforms \| expand [00/21] musl/gcc-15: Fix packages to build with gcc15 on musl platforms [01/21] unifdef: Don't use C23 constexpr keyword [02/21] unifdef: Drop md5sum for SRC_URI [03/21] nettle: Fix build with GCC-15 [04/21] make: Fix signatures for getenv() and getopt() [05/21] groff: Fix build with GCC-15 on musl [06/21] gawk: Fix build with gcc-15 on musl [07/21] which: Fix build with gcc-15 on musl [08/21] which: Drop md4sum for SRC_URI [09/21] db: Disable incompatible-pointer-types warning as error [10/21] bc: Add missing params to getopt/getenv signatures [11/21] parted: Fix build with GCC 15 [12/21] mtd-utils: Fix GCC version detection [13/21] alsa-tools: Fix build with gcc 15 [14/21] ghostscript: Pin to C17 std [15/21] lrzsz: Fix build with gcc-15 [16/21] lrzsz: Drop setting md5sum for SRC_URI [17/21] xinetd: Pin to C17 std [18/21] gperf: Pin to C17 std [19/21] apt: Fix build with GCC 15 [20/21] syslinux: Use -idirafter to add back path for system stdarg.h [21/21] vulkan-samples: Fix build with GCC-15

Message ID

20250324-b4-musl-gcc15-v1-3-ca68c03c5b01@gmail.com

State

Accepted, archived

Commit

2379010dfecffedc8d4253a03d5cb348f17ecee9

Headers

From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 24 Mar 2025 09:33:24 -0700
Subject: [PATCH 03/21] nettle: Fix build with GCC-15
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20250324-b4-musl-gcc15-v1-3-ca68c03c5b01@gmail.com>
References: <20250324-b4-musl-gcc15-v1-0-ca68c03c5b01@gmail.com>
In-Reply-To: <20250324-b4-musl-gcc15-v1-0-ca68c03c5b01@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>

Series

musl/gcc-15: Fix packages to build with gcc15 on musl platforms | expand

Commit Message

Khem Raj March 24, 2025, 4:33 p.m. UTC

These signatures are exposed when build with musl particularly

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-getopt-getenv-signatures-in-declarations.patch | 44 ++++++++++++++++++++++
 meta/recipes-support/nettle/nettle_3.10.1.bb       |  1 +
 2 files changed, 45 insertions(+)

diff --git a/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch b/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c6f75e9150aa0108bfbc852784073f24c4245779
--- /dev/null
+++ b/meta/recipes-support/nettle/nettle/0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch
@@ -0,0 +1,44 @@ 
+From 20eb61eded3bf2ef03e1f37c8c1535b9c246d0f7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Mar 2025 13:48:29 -0700
+Subject: [PATCH] getopt: Fix getopt/getenv signatures in declarations
+
+GCC-15 complains about this when trying to build on musl
+
+| ../nettle-3.10.1/getopt.c:139:14: error: conflicting types for 'getenv'; have 'char *(void)'
+|   139 | extern char *getenv ();
+|       |              ^~~~~~
+
+Upstream-Status: Submitted [https://lists.lysator.liu.se/mailman/hyperkitty/list/nettle-bugs@lists.lysator.liu.se/thread/R6BDHRO44KSRDAOZQAREYICI2RG5PVNC/]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ getopt.c | 2 +-
+ getopt.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/getopt.c b/getopt.c
+index 9d29de7..5b89302 100644
+--- a/getopt.c
++++ b/getopt.c
+@@ -136,7 +136,7 @@ static struct _getopt_data getopt_data;
+    whose names are inconsistent.  */
+ 
+ #ifndef getenv
+-extern char *getenv ();
++extern char *getenv (const char *);
+ #endif
+ 
+ #endif /* not __GNU_LIBRARY__ */
+diff --git a/getopt.h b/getopt.h
+index da1a01f..ab50792 100644
+--- a/getopt.h
++++ b/getopt.h
+@@ -166,7 +166,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv,
+ #  endif
+ # endif
+ #else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
++extern int getopt(int, char * const [], const char *);
+ #endif /* __GNU_LIBRARY__ */
+ 
+ #ifndef __need_getopt
diff --git a/meta/recipes-support/nettle/nettle_3.10.1.bb b/meta/recipes-support/nettle/nettle_3.10.1.bb
index 85c470b10da41b3f0e1e0a6a241c415c273e9932..267a6ed44955c8bd648f0ff5d12f71406e279e1a 100644
--- a/meta/recipes-support/nettle/nettle_3.10.1.bb
+++ b/meta/recipes-support/nettle/nettle_3.10.1.bb
@@ -18,6 +18,7 @@  SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://Add-target-to-only-build-tests-not-run-them.patch \
            file://run-ptest \
            file://check-header-files-of-openssl-only-if-enable_.patch \
+           file://0001-getopt-Fix-getopt-getenv-signatures-in-declarations.patch \
            "
 
 SRC_URI[sha256sum] = "b0fcdd7fc0cdea6e80dcf1dd85ba794af0d5b4a57e26397eee3bc193272d9132"

[03/21] nettle: Fix build with GCC-15

Commit Message

Patch