diff mbox series

[12/42] unzip: Fix build with GCC 15

Message ID	20250502101632.1082010-12-michael.tremer@ipfire.org
State	New
Headers	From: Michael Tremer <michael.tremer@ipfire.org> To: development@lists.ipfire.org Cc: Michael Tremer <michael.tremer@ipfire.org> Subject: [PATCH 12/42] unzip: Fix build with GCC 15 Date: Fri, 2 May 2025 10:16:02 +0000 Message-Id: <20250502101632.1082010-12-michael.tremer@ipfire.org> In-Reply-To: <20250502101632.1082010-1-michael.tremer@ipfire.org> References: <20250502101632.1082010-1-michael.tremer@ipfire.org> Precedence: list Sender: <development@lists.ipfire.org> Mail-Followup-To: <development@lists.ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/42] gcc: Update to 15 \| [01/42] gcc: Update to 15 [02/42] berkeley: Fix build with GCC 15 [03/42] m4: Fix build with GCC 15 [04/42] ncurses: Fix build with GCC 15 [05/42] perl: Fix build with GCC 15 [06/42] bash: Fix build with GCC 15 [07/42] ed: Fix build with GCC 15 [08/42] sysklogd: Fix build with GCC 15 [09/42] texinfo: Fix build with GCC 15 [10/42] jq: Fix build with GCC 15 [11/42] ppp: Fix build with GCC 15 [12/42] unzip: Fix build with GCC 15 [13/42] cpio: Fix build with GCC 15 [14/42] libconfig: Fix build with GCC 15 [15/42] linux-atm: Fix build with GCC 15 [16/42] p11-kit: Fix build with GCC 15 [17/42] cyrus-sasl: Fix build with GCC 15 [18/42] fcron: Fix build with GCC 15 [19/42] libtirpc: Fix build with GCC 15 [20/42] perl-Convert-UUlib: Fix build with GCC 15 [21/42] squidguard: Fix build with GCC 15 [22/42] mpage: Fix build with GCC 15 [23/42] cifs-utils: Fix build with GCC 15 [24/42] krb5: Fix build with GCC 15 [25/42] postfix: Fix build with GCC 15 [26/42] strongswan: Fix build with GCC 15 [27/42] w_scan: Fix build with GCC 15 [28/42] iperf3: Fix build with GCC 15 [29/42] openvmtools: Fix build with GCC 15 [30/42] usb_modeswitch: Fix build with GCC 15 [31/42] parted: Fix build with GCC 15 [32/42] xinetd: Fix build with GCC 15 [33/42] ipfire-netboot: Fix build with GCC 15 [34/42] iftop: Fix build with GCC 15 [35/42] pmacct: Fix build with GCC 15 [36/42] Revert "tcl: Update to version 9.0.1" [37/42] expect: Update to 5.45.4 [38/42] pkg-config: Fix build with GCC 15 [39/42] pam: Fix build with GCC 15 on aarch64 [40/42] perl: Respect our CFLAGS/LDFLAGS in the toolchain stage, too [41/42] make.sh: Bump the toolchain version [42/42] gmp: Fix build with GCC 15

Commit Message

Michael Tremer May 2, 2025, 10:16 a.m. UTC

  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/unzip                           |  8 ++++++--
 src/patches/unzip-gnu89-build.patch | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 src/patches/unzip-gnu89-build.patch

diff mbox series

Patch

diff --git a/lfs/unzip b/lfs/unzip
index 418ea7444..87ff9a3c7 100644
--- a/lfs/unzip
+++ b/lfs/unzip
@@ -32,6 +32,9 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# Fix build with GCC 15
+CFLAGS += -std=gnu17
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -70,10 +73,11 @@  $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/unzip-gnu89-build.patch
 	cd $(DIR_APP) && make -f unix/Makefile clean
-	cd $(DIR_APP)/unix && ./configure
+	cd $(DIR_APP)/unix && CFLAGS="$(CFLAGS)" ./configure
 	# ARM/x86_64 cannot use the x86 32 bit assembly code.
-	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_noasm
+	cd $(DIR_APP) && make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 generic_gcc
 	cd $(DIR_APP) && make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/unzip-gnu89-build.patch b/src/patches/unzip-gnu89-build.patch
new file mode 100644
index 000000000..706f12531
--- /dev/null
+++ b/src/patches/unzip-gnu89-build.patch
@@ -0,0 +1,15 @@ 
+unzip uses C89-only features, so it needs to be built in C89 mode.
+
+diff --git a/unix/Makefile b/unix/Makefile
+index ab32270cf4b9b2cf..5eabbe13095e1f58 100644
+--- a/unix/Makefile
++++ b/unix/Makefile
+@@ -545,7 +545,7 @@ generic:	flags	   # now try autoconfigure first
+ #	make $(MAKEF) unzips CF="${CF} `cat flags`"
+ 
+ generic_gcc:
+-	$(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)"
++	$(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" IZ_BZIP2="$(IZ_BZIP2)"
+ 
+ # extensions to perform SVR4 package-creation after compilation
+ generic_pkg:	generic svr4package