diff --git a/eppic-21808c78596d6d80c67eeaa08a618570ae0d886d.tar.gz b/eppic-21808c78596d6d80c67eeaa08a618570ae0d886d.tar.gz deleted file mode 100644 index 5b32f27..0000000 --- a/eppic-21808c78596d6d80c67eeaa08a618570ae0d886d.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f33d5a47197da41e90c7fb0c1431ab43e784d74bbfb08a66392c0b3fd4591a51 -size 104758 diff --git a/eppic-63c2a2072464d774097a1a6cc1d2e98290f89c49.tar.gz b/eppic-63c2a2072464d774097a1a6cc1d2e98290f89c49.tar.gz new file mode 100644 index 0000000..fe4138a --- /dev/null +++ b/eppic-63c2a2072464d774097a1a6cc1d2e98290f89c49.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e9b3f3e9eec6f949ff573236488184754cc67979b62babd92ea8507a8e4f324 +size 104806 diff --git a/makedumpfile-gcc15.patch b/makedumpfile-gcc15.patch new file mode 100644 index 0000000..64570f3 --- /dev/null +++ b/makedumpfile-gcc15.patch @@ -0,0 +1,43 @@ + +github.com/makedumpfile/makedumpfile/commit/73e62a0 + + +From 73e62a08022bf8e5edad250f8c1452f0be3771a3 Mon Sep 17 00:00:00 2001 +From: Coiby Xu +Date: Thu, 23 Jan 2025 17:47:10 +0800 +Subject: [PATCH] [PATCH] fix gcc-15 compiling error: too many arguments to + function eppic_init +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2340813 + +When building makekdumpfile against gcc-15, the following error is +shown, + + erase_info.c: In function ‘process_eppic_file’: + erase_info.c:2226:13: error: too many arguments to function ‘eppic_init’; expected 0, have 1 + 2226 | if (eppic_init(&eppic_cb)) { + | ^~~~~~~~~~ ~~~~~~~~~ + make: *** [Makefile:109: erase_info.o] Error 1 + +Signed-off-by: Coiby Xu +--- + erase_info.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/erase_info.c b/erase_info.c +index cbe1681..af6bfae 100644 +--- a/erase_info.c ++++ b/erase_info.c +@@ -2192,7 +2192,7 @@ process_eppic_file(char *name_config) + { + void *handle; + void (*eppic_load)(char *), (*eppic_unload)(char *); +- int (*eppic_init)(); ++ int (*eppic_init)(struct call_back *); + + /* + * Dynamically load the eppic_makedumpfile.so library. + diff --git a/makedumpfile.changes b/makedumpfile.changes index 722f4d3..d6df13d 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 12 16:08:52 UTC 2025 - Friedrich Haubensak + +- to fix gcc-15 compile time errors (boo#1241936): + * add makedumpfile-gcc15.patch from upstream + * update eppic_commit, which adds syntax fixes for gcc-15 + ------------------------------------------------------------------- Thu Feb 27 10:09:29 UTC 2025 - Petr Tesařík -- Update to 1.7.5: +- Update to 1.7.6: * Support for kernels up to v6.11 (x86_64) - Drop upstreamed patches: * 0001-PATCH-Fix-failure-of-hugetlb-pages-exclusion-on-Linu.patch diff --git a/makedumpfile.spec b/makedumpfile.spec index 9a36cc2..abb08d8 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -17,7 +17,7 @@ %define build_eppic 1 -%define eppic_commit 21808c78596d6d80c67eeaa08a618570ae0d886d +%define eppic_commit 63c2a2072464d774097a1a6cc1d2e98290f89c49 %if 0%{!?have_zstd:1} %if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 @@ -41,6 +41,7 @@ Patch0: %{name}-override-libtinfo.patch Patch1: %{name}-ppc64-VA-range-SUSE.patch Patch2: %{name}-PN_XNUM.patch Patch3: %{name}-fix-detection-of-typed-compound-pages-Linux-6.12.patch +Patch4: makedumpfile-gcc15.patch BuildRequires: libbz2-devel BuildRequires: libdw-devel BuildRequires: libelf-devel