Skip to contentSkip to conversation

libarchive: add conditional dependency on zlib

PATCH New Sven Neumann 2 participants 4 messages Oct 22, 2009 – Oct 23, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libarchive: add conditional dependency on zlib

If zlib is selected, then it should be built before libarchive so that libarchive picks up the headers and includes support for zlib compression.

---
 package/libarchive/libarchive.mk |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
package/libarchive/libarchive.mk +3 -0
index 32f68f7..6a2706f 100644
@@ -10,6 +10,9 @@ LIBARCHIVE_LIBTOOL_PATCH = NO
 LIBARCHIVE_INSTALL_STAGING = YES
 LIBARCHIVE_INSTALL_TARGET = YES
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBARCHIVE_DEPENDENCIES = zlib
+
 LIBARCHIVE_CONF_OPT = \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDTAR),--enable-bsdtar,--disable-bsdtar) \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),--enable-bsdcpio,--disable-bsdcpio)
Signature · 1 line
1.6.5
#1 lore raw

PATCH 1/1 libarchive: add conditional dependency on zlib

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> If zlib is selected, then it should be built before libarchive so that Sven> libarchive picks up the headers and includes support for zlib Sven> compression.

Sven> Signed-off-by: Sven Neumann <[email protected]> Sven> ---

 Sven>  package/libarchive/libarchive.mk |    3 +++

Sven> 1 files changed, 3 insertions(+), 0 deletions(-)

Sven> diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk Sven> index 32f68f7..6a2706f 100644
Sven> --- a/package/libarchive/libarchive.mk
Sven> +++ b/package/libarchive/libarchive.mk
Sven> @@ -10,6 +10,9 @@ LIBARCHIVE_LIBTOOL_PATCH = NO
Sven> LIBARCHIVE_INSTALL_STAGING = YES
Sven> LIBARCHIVE_INSTALL_TARGET = YES

Sven> +ifeq ($(BR2_PACKAGE_ZLIB),y)
Sven> +LIBARCHIVE_DEPENDENCIES = zlib
Sven> +

Where's the endif?

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 libarchive: add conditional dependency on zlib

If zlib is selected, then it should be built before libarchive so that libarchive picks up the headers and includes support for zlib compression.

---
 package/libarchive/libarchive.mk |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
package/libarchive/libarchive.mk +4 -0
index 32f68f7..efd1656 100644
@@ -10,6 +10,10 @@ LIBARCHIVE_LIBTOOL_PATCH = NO
 LIBARCHIVE_INSTALL_STAGING = YES
 LIBARCHIVE_INSTALL_TARGET = YES
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBARCHIVE_DEPENDENCIES = zlib
+endif
+
 LIBARCHIVE_CONF_OPT = \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDTAR),--enable-bsdtar,--disable-bsdtar) \
 	$(if $(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),--enable-bsdcpio,--disable-bsdcpio)
Signature · 1 line
1.6.5
#3 lore raw

PATCH 1/1 libarchive: add conditional dependency on zlib

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sven" == Sven Neumann <[email protected]> writes:

Sven> If zlib is selected, then it should be built before libarchive so that Sven> libarchive picks up the headers and includes support for zlib Sven> compression.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard