mirrors/aports
2
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2024-09-20 11:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main/syslinux: fix build with gcc 14

Browse source 
This patch is taken from fedora without any changes
This commit is contained in:
socksinspace 2024-09-07 15:05:14 +00:00 committed by Ariadne Conill
parent 24675c5b2e
commit ee566e9333
2 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
main/syslinux/0008-Fix-build-with-GCC-14.patch Normal file
View file

@ -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

2
main/syslinux/APKBUILD
View file

@ -16,6 +16,7 @@ subpackages="$pkgname-doc $pkgname-dev"
source="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/${pkgver%_pre*}/syslinux-$_ver.tar.xz
update-extlinux.conf
update-extlinux
0008-Fix-build-with-GCC-14.patch
0018-prevent-pow-optimization.patch
fix-sysmacros.patch
gcc-10.patch
@ -49,6 +50,7 @@ sha512sums="
7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 syslinux-6.04-pre1.tar.xz
2fb759e483d51769d0259587fe1f48a92d4f95e350f8dc7f055a29da75670617260c0d1a467b63ac05c7719a8fe673ca7f6244011f78592cf750f11acb8d6bb4 update-extlinux.conf
ebd33afdc8c0ea18867f9bc970e54da6b72fc8dddc0475b0d6b24f6c76a1d7d7b8568332f3f9b36122af273d5bd5ea940e8d4aaf978d86029d015329f74c480c update-extlinux
7ebae0528ed48385d2595274ce34b27ecee9738829514336092179f5617fd053e4a028a6ef6f6894ec4103b7a624169301dc1b41b8de71d74749495a303af387 0008-Fix-build-with-GCC-14.patch
92fa48133ef702092d7acafae0e0e20f9355cd2b5fe199b96fcccba5a1e688c360de4d069391815255f5493228ad03998d20b99748323396d20d12a1f27c60cd 0018-prevent-pow-optimization.patch
6fb63b50a6c746445a58badc81cbf8525f38e2a7868b97ac21aa9d20c162f2318fab6c25505614700033a840aa5c06c3cef3065f11b5b5f4e514474194ff4b54 fix-sysmacros.patch
62a45f94107300b05a93be18a228c15ae9ce90addeee39a1ef35845077b493e72ebed35791bf8db21c406c379a83220cc4db4e1919c01fcd387ae10b2cfc8861 gcc-10.patch