p7zip: update to version 15.14.1

The copying.txt file contains white space changes and the address of the
Free Software Foundation mentioned in the LGPLv3.1 changed from:
51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
to:
59 Temple Place, Suite 330, Boston, MA  02111-1307
otherwise the license text remains unchanged.

An additional License.txt containing top level license information is now
also covered by LIC_FILES_CHKSUM

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Pascal Bach
2016-06-17 16:10:41 +02:00
committed by Martin Jansa
parent 0647b7d640
commit d24e984e28
2 changed files with 17 additions and 17 deletions
@@ -7,25 +7,24 @@ Upstream-Status: Pending
Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
Reviewed-By: Pascal Bach <pascal.bach@siemens.com>
Index: p7zip_9.20.1/makefile.machine
=====================================================================
--- p7zip_9.20.1/makefile.machine 2011-03-13 12:54:57.000000000 +0100
+++ p7zip_9.20.1/makefile.machine 2015-02-03 08:39:44.427696944 +0100
@@ -4,14 +4,14 @@
diff -Nurp p7zip_15.14.1_orig/makefile.machine p7zip_15.14.1/makefile.machine
--- p7zip_15.14.1_orig/makefile.machine 2016-03-23 20:37:47.000000000 +0100
+++ p7zip_15.14.1/makefile.machine 2016-06-17 15:33:39.720454477 +0200
@@ -2,7 +2,7 @@
# makefile for Linux (x86, PPC, alpha ...)
#
OPTFLAGS=-O
-OPTFLAGS=-O -s
+OPTFLAGS=-O
-ALLFLAGS=${OPTFLAGS} -pipe -s \
+ALLFLAGS=${OPTFLAGS} -pipe \
ALLFLAGS=${OPTFLAGS} -pipe \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-DNDEBUG -D_REENTRANT -DENV_UNIX \
@@ -10,8 +10,6 @@ ALLFLAGS=${OPTFLAGS} -pipe \
-D_7ZIP_LARGE_PAGES \
$(LOCAL_FLAGS)
-CXX=g++ $(ALLFLAGS)
-CC=gcc $(ALLFLAGS)
+CXX+=$(ALLFLAGS)
+CC+=$(ALLFLAGS)
-CXX=g++
-CC=gcc
CC_SHARED=-fPIC
LINK_SHARED=-fPIC -shared
@@ -1,13 +1,14 @@
SUMMARY = "7-zip is a commandline utility handling 7z archives."
HOMEPAGE = "http://www.7-zip.org/"
LICENSE = "LGPL-2.1+ & unRAR"
LIC_FILES_CHKSUM = "file://DOCS/copying.txt;md5=ecfc54c9e37b63ac58900061ce2eab5a \
file://DOCS/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de"
LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \
file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \
file://DOC/License.txt;md5=8346bfd0a2fa0987e7a3a512adf84ab9"
SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_all.tar.bz2 \
file://do_not_override_compiler_and_do_not_strip.patch"
SRC_URI[md5sum] = "bd6caaea567dc0d995c990c5cc883c89"
SRC_URI[sha256sum] = "49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
SRC_URI[md5sum] = "92cca093312b5a71a7be7dc7d1d32509"
SRC_URI[sha256sum] = "699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4"
S = "${WORKDIR}/${BPN}_${PV}"