7zip: Fix build against GCC 10

[ipfire-2.x.git] / lfs / 7zip

diff --git a/lfs/7zip b/lfs/7zip
index d2f8192566455fc3b600fc327c6311e3ad11a5b6..443119b6e543531d904523ff4143897afd631b14 100644 (file)
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -36,6 +36,8 @@ PAK_VER    = 7
 
 DEPS       =
 
+CFLAGS    += -fcommon
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -77,7 +79,7 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip_change_install_folder.patch
+       cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip-16.02-consolidated_fixes-1.patch
        cd $(DIR_APP) && make 7z $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)