[05/21] groff: Fix build with GCC-15 on musl

Message ID	20250324-b4-musl-gcc15-v1-5-ca68c03c5b01@gmail.com
State	Accepted, archived
Commit	01e7393565037119602a789ff02bf9f2e6b07b4d
Headers	show Return-Path: <raj.khem@gmail.com> ip: 209.85.214.178, mailfrom: raj.khem@gmail.com) From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Mar 2025 09:33:26 -0700 Subject: [PATCH 05/21] groff: Fix build with GCC-15 on musl MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250324-b4-musl-gcc15-v1-5-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-5-ca68c03c5b01@gmail.com

State

Accepted, archived

Commit

01e7393565037119602a789ff02bf9f2e6b07b4d

Headers

From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 24 Mar 2025 09:33:26 -0700
Subject: [PATCH 05/21] groff: Fix build with GCC-15 on musl
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20250324-b4-musl-gcc15-v1-5-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

part of getopt.c is used in non-glibc libraries needs
attention when compiling with gcc-15

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...0001-getopt-Fix-type-signature-for-getenv.patch | 27 ++++++++++++++++++++++
 meta/recipes-extended/groff/groff_1.23.0.bb        |  1 +
 2 files changed, 28 insertions(+)

diff --git a/meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch b/meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c69a2b4f6738ff739a96ed7a4f4a87b1afb0a684
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-getopt-Fix-type-signature-for-getenv.patch
@@ -0,0 +1,27 @@ 
+From b68b3c6157c531bdcf5812fd93aadff9c18de6bd Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Mar 2025 14:41:23 -0700
+Subject: [PATCH] getopt: Fix type signature for getenv()
+
+This fixes build on musl with GCC 15
+
+Upstream-Status: Inappropriate [Next version is use getopt.c from gnulib]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/libs/libgroff/getopt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libs/libgroff/getopt.c b/src/libs/libgroff/getopt.c
+index 6efa529..ce39115 100644
+--- a/src/libs/libgroff/getopt.c
++++ b/src/libs/libgroff/getopt.c
+@@ -122,7 +122,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/meta/recipes-extended/groff/groff_1.23.0.bb b/meta/recipes-extended/groff/groff_1.23.0.bb
index 34a42c7e264a63c021076737b326b397ffd8c184..0c2ef6175826a0acd1affaf60b09297a171d858c 100644
--- a/meta/recipes-extended/groff/groff_1.23.0.bb
+++ b/meta/recipes-extended/groff/groff_1.23.0.bb
@@ -14,6 +14,7 @@  SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
            file://0001-build-meintro_fr.ps-depends-on-tbl.patch \
            file://0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch \
            file://0001-contrib-hdtbl-hdtbl.am-Fix-race-issues-for-parallel-.patch \
+           file://0001-getopt-Fix-type-signature-for-getenv.patch \
            "
 
 SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"

[05/21] groff: Fix build with GCC-15 on musl

Commit Message

Patch