summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2025-03-24 09:33:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-27 11:19:03 +0000
commita6b876bc4880c597c5c2753702f4d1de3986448f (patch)
treed7b7da2dc259485f730fea829c6ea9f8a661afb0
parentd56592776d5d93a7ef036435a1bc3da9c7cf5aeb (diff)
downloadpoky-a6b876bc4880c597c5c2753702f4d1de3986448f.tar.gz
parted: Fix build with GCC 15
(From OE-Core rev: a37d5e98695793d7fa45c89cb47688ab453d13b1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch40
-rw-r--r--meta/recipes-extended/parted/parted_3.6.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
new file mode 100644
index 0000000000..a8ea7ec4f7
--- /dev/null
+++ b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch
@@ -0,0 +1,40 @@
1From eb6bb2e8dfc78ca1a187d07ea29b23a805c61794 Mon Sep 17 00:00:00 2001
2From: Rudi Heitbaum <rudi@heitbaum.com>
3Date: Wed, 20 Nov 2024 12:22:22 +0000
4Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration
5
6With gcc 15-20241117 compile fails with the below error, update the
7do_version declaration to match the header in command.h
8
9../../parted/parted.c: In function '_init_commands':
10../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types]
11 2469 | do_version,
12 | ^~~~~~~~~~
13 | |
14 | int (*)(void)
15In file included from ../../parted/parted.c:28:
16../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)'
17 35 | int (*method) (PedDevice** dev, PedDisk** diskp),
18 | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
19
20Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271]
21Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
22Signed-off-by: Brian C. Lane <bcl@redhat.com>
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24---
25 parted/parted.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/parted/parted.c b/parted/parted.c
29index 3abb52f..fc2aeba 100644
30--- a/parted/parted.c
31+++ b/parted/parted.c
32@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp)
33 }
34
35 static int
36-do_version ()
37+do_version (PedDevice** dev, PedDisk** diskp)
38 {
39 printf ("\n%s\n%s",
40 prog_name,
diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb
index fae35815be..6fc2cb3b3a 100644
--- a/meta/recipes-extended/parted/parted_3.6.bb
+++ b/meta/recipes-extended/parted/parted_3.6.bb
@@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ 11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \
12 file://autoconf-2.73.patch \ 12 file://autoconf-2.73.patch \
13 file://0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch \
13 file://run-ptest \ 14 file://run-ptest \
14 " 15 "
15 16