exoscale: Get SSH key from meta-data API

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

diff --git a/lfs/7zip b/lfs/7zip
index 0c16a6f6fa0b5c877f4bb6d071796ae84644243e..7f8ca29f4d466e2da52c4ade272f8b86754d2e53 100644 (file)
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -34,7 +34,9 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = 7zip
 PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
+
+CFLAGS    += -fcommon
 
 ###############################################################################
 # Top-level Rules
@@ -77,8 +79,9 @@ 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) && make 7z $(MAKETUNING)
-       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip-16.02-consolidated_fixes-1.patch
+       cd $(DIR_APP) && make all3 $(MAKETUNING)
+       cd $(DIR_APP) && make DEST_HOME=/usr DEST_MAN=/usr/share/man \
+               DEST_SHARE_DOC=/usr/share/doc/p7zip-$(VER) install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)