ソースを参照

libarchive: add hash and enable lzma support

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>
Nimai Mahajan 10 年 前
コミット
eab1756c19
2 ファイル変更9 行追加1 行削除
  1. 2 0
      package/libarchive/libarchive.hash
  2. 7 1
      package/libarchive/libarchive.mk

+ 2 - 0
package/libarchive/libarchive.hash

@@ -0,0 +1,2 @@
+# Locally computed:
+sha256  eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e  libarchive-3.1.2.tar.gz

+ 7 - 1
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))