Skip to contentSkip to conversation

Modified libarchive.mk to enable support for xz/lzma

PATCH New nimaim at gmail.com 2 participants 2 messages Jun 18, 2015 – Jun 19, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Modified libarchive.mk to enable support for xz/lzma

From: Nimai <[email protected]>

---
 package/libarchive/libarchive.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/libarchive/libarchive.mk +6 -1
index 61528d9..18fa8b7 100644
@@ -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,10 @@ else
 LIBARCHIVE_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_XZ),y)
+LIBARCHIVE_DEPENDENCIES += xz
+else
+LIBARCHIVE_CONF_OPTS += --without-lzma
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 Modified libarchive.mk to enable support for xz/lzma

Hi Nimai,

Quoted 1 line · nimaim at gmail.com

From: Nimai <[email protected]>

A slightly more extensive commit message would be good, e.g.

Both xz and lzma support are provided by the xz library.

Quoted 2 lines

A signed-off-by is a legal statement, therefore it should have your ful name.

Quoted 17 lines
---
 package/libarchive/libarchive.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/libarchive/libarchive.mk +0 -1
index 61528d9..18fa8b7 100644
@@ -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)

package/libarchive/libarchive.mk else · line 89

Quoted 5 lines
package/libarchive/libarchive.mk +2 -0
@@ -86,4 +85,10 @@ else
 LIBARCHIVE_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_XZ),y)
+LIBARCHIVE_DEPENDENCIES += xz

We prefer to explicitly enable/disable, so add

LIBARCHIVE_CONF_OPTS += --with-lzma

Can you fix these issues and repost?

Regards,
Arnout

Quoted 6 lines
package/libarchive/libarchive.mk +4 -0
+else
+LIBARCHIVE_CONF_OPTS += --without-lzma
+endif
+
 $(eval $(autotools-package))
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F