diff options
| author | Zach van Rijn <me@zv.io> | 2024-05-31 20:53:56 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-08-07 10:08:20 -0500 |
| commit | 0bda3bf711b0fe7dc942f1981b758b759170df97 (patch) | |
| tree | 6e1ae0ee211d1f8d384af058322f39135544f64d | |
| parent | 2ee5993ee62311cb510e8f77ee03e1ec0b593934 (diff) | |
| download | packages-0bda3bf711b0fe7dc942f1981b758b759170df97.tar.gz packages-0bda3bf711b0fe7dc942f1981b758b759170df97.tar.bz2 packages-0bda3bf711b0fe7dc942f1981b758b759170df97.tar.xz packages-0bda3bf711b0fe7dc942f1981b758b759170df97.zip | |
user/lilo: add patch for GCC 10+. fixes #1179.
| -rw-r--r-- | user/lilo/APKBUILD | 4 | ||||
| -rw-r--r-- | user/lilo/gcc10.patch | 51 |
2 files changed, 54 insertions, 1 deletions
diff --git a/user/lilo/APKBUILD b/user/lilo/APKBUILD index 6282c211c..4e29aa282 100644 --- a/user/lilo/APKBUILD +++ b/user/lilo/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=lilo pkgver=24.2 -pkgrel=1 +pkgrel=2 pkgdesc="Minimal BIOS bootloader for x86 systems" url="https://www.joonet.de/lilo/" arch="pmmx x86 x86_64" @@ -11,6 +11,7 @@ depends="perl" makedepends="dev86 linux-headers lvm2-dev sharutils" subpackages="$pkgname-doc" source="https://www.joonet.de/lilo/ftp/sources/lilo-$pkgver.tar.gz + gcc10.patch adelie.patch cflags.patch initramfs.patch @@ -48,6 +49,7 @@ package() { } sha512sums="4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 lilo-24.2.tar.gz +0ef0ab379e787767bcee2c77eeb7bc5acce908850077dcc14a1d71f3a78761946e8e252089fecb441c26cbbee66c868021d42a300d05579d083e654026cf8682 gcc10.patch cf8dab563e88cc7b280f5740c3b0f25049b9ce27c77a67e7b0c55dc21a158f8b2998f0c7743f11bcc4ae893697e6b6cc56054a40919899bf2d6d79b4e1a59190 adelie.patch ed1ffb03dbbbf6fe6974d045005f72b3657d470cd3f3556d582e09a38836090c3e75a684a1dcfbe7ade91e5ada3706b712ae7111460df85454518a746c60bde4 cflags.patch 98e26319a747e6cc7e9d7c695d20e511ef9d196dfc312403c7171380e75edbbdec6af39c0f1670956bcd7ec9ff203505c4001962c767f651b730da31830ed35f initramfs.patch diff --git a/user/lilo/gcc10.patch b/user/lilo/gcc10.patch new file mode 100644 index 000000000..c46b9eebd --- /dev/null +++ b/user/lilo/gcc10.patch @@ -0,0 +1,51 @@ +Description: Fix ftbfs with GCC-10 + +Author: Ryan Finnie <ryan@finnie.org> +Bug-Debian: https://bugs.debian.org/957490 +Forwarded: no + +--- + +--- a/src/raid.h ++++ b/src/raid.h +@@ -8,7 +8,7 @@ + * in the source directory. + */ + +-int do_md_install, ndisk, md_bios; ++extern int ndisk, md_bios; + + int raid_setup(void); + void raid_final(void); +--- a/src/bsect.c ++++ b/src/bsect.c +@@ -54,8 +54,6 @@ + #endif + + +-int boot_dev_nr; +- + static BOOT_SECTOR bsect,bsect_orig; + static MENUTABLE menuparams; + static DESCR_SECTORS descrs; +--- a/src/identify.c ++++ b/src/identify.c +@@ -19,7 +19,6 @@ + #include "common.h" + #include "cfg.h" + +-char *identify; + static char *opt; + static char *first, *dflt; + static int idefault; +--- a/src/raid.c ++++ b/src/raid.c +@@ -41,7 +41,7 @@ + static int raid_bios[MAX_RAID+1]; + static int device; + enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED}; +-int do_md_install, ndisk, md_bios; ++int ndisk, md_bios; + static char *raid_list[MAX_RAID]; + static int list_index[MAX_RAID]; + static int nlist, faulty; |