diff mbox series

[15/19] syslinux: Fix build with GCC 14

Message ID	20240819100608.991138-16-michael.tremer@ipfire.org
State	Staged
Commit	ec054262e9616f276368fb3be088779127b3a793
Headers	From: Michael Tremer <michael.tremer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 15/19] syslinux: Fix build with GCC 14 Date: Mon, 19 Aug 2024 10:06:04 +0000 Message-Id: <20240819100608.991138-16-michael.tremer@ipfire.org> In-Reply-To: <20240819100608.991138-1-michael.tremer@ipfire.org> References: <20240819100608.991138-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: K4BVBYKTRN5FZBPSD3OJEVCZWNI5C7PP CC: Michael Tremer <michael.tremer@ipfire.org> Precedence: list Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/K4BVBYKTRN5FZBPSD3OJEVCZWNI5C7PP/>
Series	[01/19] expect: Fix build with GCC 14.2 \| [01/19] expect: Fix build with GCC 14.2 [02/19] coreutils: Drop uname patch [03/19] glibc: Update to 2.40 [04/19] make.sh: Bump the toolchain version [05/19] GCC: Update to 14.2.0 [06/19] misc-progs: Fix compilation with GCC 14 [07/19] whatmask: Fix build with GCC 14 [08/19] ntp: Fix build with GCC 14 [09/19] setup: Fix compilation issues with GCC 14 [10/19] autoconf-archive: New package [11/19] berkeley: Fix build with GCC 14 [12/19] squidguard: Fix compliation with GCC 14 [13/19] ghostscript: Fix compilation with GCC 14 [14/19] collectd: Ignore compiler errors [15/19] syslinux: Fix build with GCC 14 [16/19] tftpd: Fix build with GCC 14 [17/19] telnet: Fix build with GCC 14 [18/19] lcdproc: Fix build with GCC 14 [19/19] gnupg: This package no longer seems to be able to link against LDAP

Commit Message

Michael Tremer Aug. 19, 2024, 10:06 a.m. UTC

  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/syslinux                                  |  1 +
 ...inux-6.04-pre1-fix-build-with-gcc-14.patch | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch

diff mbox series

Patch

diff --git a/lfs/syslinux b/lfs/syslinux
index 150e4071e..98719560e 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -80,6 +80,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_pre1-fcommon.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
 
 	# Build
 	cd $(DIR_APP) && make bios $(MAKETUNING)
diff --git a/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch b/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
new file mode 100644
index 000000000..61de20eae
--- /dev/null
+++ b/src/patches/syslinux-6.04-pre1-fix-build-with-gcc-14.patch
@@ -0,0 +1,61 @@ 
+From 321433861cc9cd3c7e0ee02830e561bc0f956998 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sun, 4 Feb 2024 11:46:02 -0500
+Subject: [PATCH] Fix build with GCC 14
+
+com32/lib/syslinux/debug.c: In function ‘syslinux_debug’:
+com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’
+
+com32/libupload/upload_tftp.c: In function ‘upload_tftp_write’:
+com32/libupload/upload_tftp.c:64:11: error: implicit declaration of function ‘tftp_put’
+
+com32/chain/chain.c: In function ‘main’:
+com32/chain/chain.c:517:44: error: passing argument 3 of ‘loadfile’ from incompatible pointer type
+com32/include/syslinux/loadfile.h:11:37: note: expected ‘size_t *’ but argument is of type ‘addr_t *’
+
+---
+ com32/chain/chain.c        | 2 +-
+ com32/lib/syslinux/debug.c | 1 +
+ com32/libupload/tftp.h     | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/com32/chain/chain.c b/com32/chain/chain.c
+index 4e9e32d..b11b880 100644
+--- a/com32/chain/chain.c
++++ b/com32/chain/chain.c
+@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
+     if (opt.file) {
+ 	fdat.base = (opt.fseg << 4) + opt.foff;
+ 
+-	if (loadfile(opt.file, &fdat.data, &fdat.size)) {
++	if (loadfile(opt.file, &fdat.data, (size_t*)&fdat.size)) {
+ 	    error("Couldn't read the boot file.");
+ 	    goto bail;
+ 	}
+diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
+index d9ab863..e8f53d5 100644
+--- a/com32/lib/syslinux/debug.c
++++ b/com32/lib/syslinux/debug.c
+@@ -1,6 +1,7 @@
+ #include <linux/list.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stdio.h>
+ 
+ #ifdef DYNAMIC_DEBUG
+ 
+diff --git a/com32/libupload/tftp.h b/com32/libupload/tftp.h
+index 323dc16..09aa40b 100644
+--- a/com32/libupload/tftp.h
++++ b/com32/libupload/tftp.h
+@@ -19,4 +19,7 @@ TFTP_OK	= 11, /* Not in RFC */
+ };
+ 
+ extern const char *tftp_string_error_message[];
++
++extern int tftp_put(struct url_info *url, int flags, struct inode *inode,
++                               const char **redir, char *data, int data_length);
+ #endif
+-- 
+2.43.0
+