diff mbox

[v4] p7zip: New package

Message ID 1464731871-12355-1-git-send-email-nerv@dawncrow.de
State Accepted
Headers show

Commit Message

André Zwing May 31, 2016, 9:57 p.m. UTC 
Only enabled on a subset of known-working architectures.
It fails to build on some archs, like blackfin.

Signed-off-by: André Hentschel <nerv@dawncrow.de>
---
 package/Config.in        |  1 +
 package/p7zip/Config.in  | 16 ++++++++++++++++
 package/p7zip/p7zip.hash |  3 +++
 package/p7zip/p7zip.mk   | 27 +++++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 package/p7zip/Config.in
 create mode 100644 package/p7zip/p7zip.hash
 create mode 100644 package/p7zip/p7zip.mk

Comments

Thomas Petazzoni June 8, 2016, 12:07 p.m. UTC | #1 
Hello,

On Tue, 31 May 2016 23:57:51 +0200, André Hentschel wrote:
> Only enabled on a subset of known-working architectures.
> It fails to build on some archs, like blackfin.
> 
> Signed-off-by: André Hentschel <nerv@dawncrow.de>
> ---
>  package/Config.in        |  1 +
>  package/p7zip/Config.in  | 16 ++++++++++++++++
>  package/p7zip/p7zip.hash |  3 +++
>  package/p7zip/p7zip.mk   | 27 +++++++++++++++++++++++++++
>  4 files changed, 47 insertions(+)
>  create mode 100644 package/p7zip/Config.in
>  create mode 100644 package/p7zip/p7zip.hash
>  create mode 100644 package/p7zip/p7zip.mk

Applied to master with the following changes:

    [Thomas:
     - Add comment about the Blackfin exception.
     - Propagate the Blackfin exception to the Config.in comment.
     - Fix the license, it is the LGPLv2.1+ *with* the unRAR restriction.
     - Use $(INSTALL) -D -m 0755 to install the binary instead of cp.]

Thanks!

Thomas
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 9d668bf..073b88e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -59,6 +59,7 @@  endif
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
+	source "package/p7zip/Config.in"
 	source "package/unrar/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/unzip/Config.in"
diff --git a/package/p7zip/Config.in b/package/p7zip/Config.in
new file mode 100644
index 0000000..fe5e976
--- /dev/null
+++ b/package/p7zip/Config.in
@@ -0,0 +1,16 @@ 
+config BR2_PACKAGE_P7ZIP
+	bool "p7zip"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_WCHAR
+	depends on !BR2_bfin
+	help
+	  p7zip is a quick port of the command line version of 7-zip for Unix.
+	  (see http://www.7-zip.org)
+
+	  7-Zip is a file archiver with highest compression ratio.
+
+	  http://sourceforge.net/projects/p7zip
+
+comment "p7zip needs a toolchain w/ threads, wchar, C++"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/p7zip/p7zip.hash b/package/p7zip/p7zip.hash
new file mode 100644
index 0000000..ead6d87
--- /dev/null
+++ b/package/p7zip/p7zip.hash
@@ -0,0 +1,3 @@ 
+# From https://sourceforge.net/projects/p7zip/files/p7zip/
+md5	92cca093312b5a71a7be7dc7d1d32509	p7zip_15.14.1_src_all.tar.bz2
+sha1	9b15a79f94230fab9b9d4f9f532c723117145c7a	p7zip_15.14.1_src_all.tar.bz2
diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk
new file mode 100644
index 0000000..6c01a68
--- /dev/null
+++ b/package/p7zip/p7zip.mk
@@ -0,0 +1,27 @@ 
+################################################################################
+#
+# p7zip
+#
+################################################################################
+
+P7ZIP_VERSION = 15.14.1
+P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2
+P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION)
+P7ZIP_LICENSE = LGPLv2.1+
+P7ZIP_LICENSE_FILES = DOC/License.txt
+
+# p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and
+# CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C
+# and ALLFLAGS_CPP as variables to pass the CFLAGS and CXXFLAGS.
+define P7ZIP_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" ALLFLAGS_C="$(TARGET_CFLAGS)" \
+		CXX="$(TARGET_CXX)" ALLFLAGS_CPP="$(TARGET_CXXFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		-C $(@D) 7zr
+endef
+
+define P7ZIP_INSTALL_TARGET_CMDS
+	cp -dpf $(@D)/bin/7zr $(TARGET_DIR)/usr/bin/
+endef
+
+$(eval $(generic-package))