libloc: Import recent patches from upstream

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

diff --git a/lfs/7zip b/lfs/7zip
index 358db931cf5292b8917ce729b78cc8d72d3033c0..7f8ca29f4d466e2da52c4ade272f8b86754d2e53 100644 (file)
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,17 +24,19 @@
 
 include Config
 
-VER        = 4.58
+VER        = 16.02
 
 THISAPP    = p7zip_$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP)_src_all.tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = 7zip
-PAK_VER    = 1
+PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
+
+CFLAGS    += -fcommon
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 315b184102c17c4956f53218d973222d
+$(DL_FILE)_MD5 = a0128d661cfe7cc8c121e73519c54fbf
 
 install : $(TARGET)
 
@@ -77,7 +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) && 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)