projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a76c35)
libarchive: add hash and enable lzma support
authorNimai Mahajan <nimaim@gmail.com>
Fri, 26 Jun 2015 15:01:58 +0000 (11:01 -0400)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 26 Jun 2015 19:26:47 +0000 (21:26 +0200)
Add libarchive hash. Enable lzma support.
Both xz and lzma support are provided by the xz library.

[Thomas: explicitly pass --with-lzma when xz is available.]

Signed-off-by: Nimai Mahajan <nimaim@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/libarchive/libarchive.hash [new file with mode: 0644] patch | blob
package/libarchive/libarchive.mk patch | blob | history

diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash
new file mode 100644 (file)
index 0000000..5f96211
--- /dev/null
+++ b/package/libarchive/libarchive.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256  eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e  libarchive-3.1.2.tar.gz
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 61528d948ae44d7137cb7fd71fc9f3a96a65f7eb..206de3f58d77d08d909525021794934daca1ef02 100644 (file)
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -9,7 +9,6 @@ LIBARCHIVE_SITE = http://www.libarchive.org/downloads
 LIBARCHIVE_INSTALL_STAGING = YES
 LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
 LIBARCHIVE_LICENSE_FILES = COPYING
-LIBARCHIVE_CONF_OPTS = --without-lzma
 
 ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
 ifeq ($(BR2_STATIC_LIBS),y)
@@ -86,4 +85,11 @@ else
 LIBARCHIVE_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_XZ),y)
+LIBARCHIVE_DEPENDENCIES += xz
+LIBARCHIVE_CONF_OPTS += --with-lzma
+else
+LIBARCHIVE_CONF_OPTS += --without-lzma
+endif
+
 $(eval $(autotools-package))