From d24e984e286402087107e6e58796ed6f5bceb08c Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 17 Jun 2016 16:10:41 +0200 Subject: 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 Signed-off-by: Martin Jansa --- ...do_not_override_compiler_and_do_not_strip.patch | 25 ++++++++------- meta-oe/recipes-extended/p7zip/p7zip_15.14.1.bb | 36 ++++++++++++++++++++++ meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb | 35 --------------------- 3 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 meta-oe/recipes-extended/p7zip/p7zip_15.14.1.bb delete mode 100644 meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb (limited to 'meta-oe/recipes-extended') diff --git a/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch b/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch index a3b02c5dc0..b0a560fe98 100644 --- a/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch +++ b/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch @@ -7,25 +7,24 @@ Upstream-Status: Pending Signed-off-by: Raphael Freudiger Reviewed-By: Pascal Bach -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 diff --git a/meta-oe/recipes-extended/p7zip/p7zip_15.14.1.bb b/meta-oe/recipes-extended/p7zip/p7zip_15.14.1.bb new file mode 100644 index 0000000000..8e2e241ea2 --- /dev/null +++ b/meta-oe/recipes-extended/p7zip/p7zip_15.14.1.bb @@ -0,0 +1,36 @@ +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://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] = "92cca093312b5a71a7be7dc7d1d32509" +SRC_URI[sha256sum] = "699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4" + +S = "${WORKDIR}/${BPN}_${PV}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/bin/* ${D}${bindir} +} + +# all3: to build bin/7za, bin/7z (with its plugins), bin/7zr and bin/7zCon.sfx +EXTRA_OEMAKE_class-native = "all3" + +do_install_class-native() { + install -d ${D}${bindir} + install -d ${D}${bindir}/Codecs + install -m 0755 ${S}/bin/7* ${D}${bindir} + install -m 0755 ${S}/bin/Codecs/* ${D}${bindir}/Codecs + + # Create a shell script wrapper to execute next to 7z.so + mv ${D}${bindir}/7z ${D}${bindir}/7z.bin + echo "#! /bin/sh" > ${D}${bindir}/7z + echo "exec ${D}${bindir}/7z.bin \"\$@\"" >> ${D}${bindir}/7z + chmod 0755 ${D}${bindir}/7z +} + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb b/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb deleted file mode 100644 index b89fc42dea..0000000000 --- a/meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -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" - -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" - -S = "${WORKDIR}/${BPN}_${PV}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/bin/* ${D}${bindir} -} - -# all3: to build bin/7za, bin/7z (with its plugins), bin/7zr and bin/7zCon.sfx -EXTRA_OEMAKE_class-native = "all3" - -do_install_class-native() { - install -d ${D}${bindir} - install -d ${D}${bindir}/Codecs - install -m 0755 ${S}/bin/7* ${D}${bindir} - install -m 0755 ${S}/bin/Codecs/* ${D}${bindir}/Codecs - - # Create a shell script wrapper to execute next to 7z.so - mv ${D}${bindir}/7z ${D}${bindir}/7z.bin - echo "#! /bin/sh" > ${D}${bindir}/7z - echo "exec ${D}${bindir}/7z.bin \"\$@\"" >> ${D}${bindir}/7z - chmod 0755 ${D}${bindir}/7z -} - -BBCLASSEXTEND += "native" -- cgit 1.2.3-korg