diff mbox series

[22/24] time: Fix build with GCC 15

Message ID 20250318043846.2422141-22-raj.khem@gmail.com
State Accepted, archived
Commit ed19b9a801fb5410e7c9e37bd29453b3c8d8e0be
Headers show
Series [01/24] webkitgtk: 2.46.6 -> 2.48.0 | expand

Commit Message

Khem Raj March 18, 2025, 4:38 a.m. UTC
Initialize interrupt_signal and quit_signal with correct type

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../time-1.9-Fix-compiling-with-GCC15.patch   | 33 +++++++++++++++++++
 meta/recipes-extended/time/time_1.9.bb        |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch

Comments

Mathieu Dubois-Briand March 18, 2025, 1:12 p.m. UTC | #1
On Tue Mar 18, 2025 at 5:38 AM CET, Khem Raj via lists.openembedded.org wrote:
> Initialize interrupt_signal and quit_signal with correct type
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---

Hi Khem,

Thanks for your patch.

It looks like this is breaking the build, maybe just for musl:

ERROR: time-1.9-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/time/1.9/temp/run.do_compile.3718025' failed with exit code 1
...
| ../time-1.9/src/time.c:731:3: error: unknown type name '__sighandler_t'; did you mean 'sighandler_t'?

https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/1215

Can you have a look at this build failure please?
Khem Raj March 19, 2025, 8:20 a.m. UTC | #2
On Tue, Mar 18, 2025 at 6:12 AM Mathieu Dubois-Briand
<mathieu.dubois-briand@bootlin.com> wrote:
>
> On Tue Mar 18, 2025 at 5:38 AM CET, Khem Raj via lists.openembedded.org wrote:
> > Initialize interrupt_signal and quit_signal with correct type
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
>
> Hi Khem,
>
> Thanks for your patch.
>
> It looks like this is breaking the build, maybe just for musl:
>
> ERROR: time-1.9-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/musl-qemux86/build/build/tmp/work/core2-32-poky-linux-musl/time/1.9/temp/run.do_compile.3718025' failed with exit code 1
> ...
> | ../time-1.9/src/time.c:731:3: error: unknown type name '__sighandler_t'; did you mean 'sighandler_t'?
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/1215
>
> Can you have a look at this build failure please?

musl found that upstream fix is not complete, I have fixed the fallout
and sent upstream as well as its included in V3 series here.

>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
diff mbox series

Patch

diff --git a/meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch b/meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch
new file mode 100644
index 00000000000..76141aec18c
--- /dev/null
+++ b/meta/recipes-extended/time/time/time-1.9-Fix-compiling-with-GCC15.patch
@@ -0,0 +1,33 @@ 
+From 831194f0be7733c99c7a2c69d9e9695b82e05010 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= <opohorel@redhat.com>
+Date: Thu, 30 Jan 2025 08:48:47 +0100
+Subject: [PATCH] time: fix compiling with GCC15
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC15 complains about incompatible pointer type in run_command()
+Initialize interrupt_signal and quit_signal with correct type
+
+Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-time/2025-01/msg00000.html]
+Signed-off-by: Ondřej Pohořelský <opohorel@redhat.com>
+---
+ src/time.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/time.c b/src/time.c
+index 7b401bc..c8d7ab0 100644
+--- a/src/time.c
++++ b/src/time.c
+@@ -803,7 +803,7 @@ run_command (cmd, resp)
+      RESUSE *resp;
+ {
+   pid_t pid;			/* Pid of child.  */
+-  sighandler interrupt_signal, quit_signal;
++  __sighandler_t interrupt_signal, quit_signal;
+   int saved_errno;
+ 
+   resuse_start (resp);
+-- 
+2.48.1
+
diff --git a/meta/recipes-extended/time/time_1.9.bb b/meta/recipes-extended/time/time_1.9.bb
index 8364210e61c..d9e2d06b32d 100644
--- a/meta/recipes-extended/time/time_1.9.bb
+++ b/meta/recipes-extended/time/time_1.9.bb
@@ -15,6 +15,7 @@  BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
            file://0001-include-string.h-for-memset.patch \
+           file://time-1.9-Fix-compiling-with-GCC15.patch \
            "
 
 SRC_URI[md5sum] = "d2356e0fe1c0b85285d83c6b2ad51b5f"