diff mbox series

[v2,2/3] package/libarchive: add lz4 optional dependency

Message ID 20200228221236.1982482-2-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [v2,1/3] package/libarchive: security bump to version 3.4.2 | expand

Commit Message

Fabrice Fontaine Feb. 28, 2020, 10:12 p.m. UTC 
lz4 is available since version 3.2.0 and
https://github.com/libarchive/libarchive/commit/724f3f918e509ddca60ce62fad696d7621d3623d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libarchive/libarchive.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Thomas Petazzoni April 25, 2020, 7:56 p.m. UTC | #1 
On Fri, 28 Feb 2020 23:12:35 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> lz4 is available since version 3.2.0 and
> https://github.com/libarchive/libarchive/commit/724f3f918e509ddca60ce62fad696d7621d3623d
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libarchive/libarchive.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
> index b7ae5fb0cf..d07f0776a6 100644
> --- a/package/libarchive/libarchive.mk
> +++ b/package/libarchive/libarchive.mk
> @@ -78,6 +78,12 @@ else
>  LIBARCHIVE_CONF_OPTS += --without-xml2
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LZ4),y)
> +LIBARCHIVE_DEPENDENCIES += lz4

I've added an explicit --with-lz4 here and applied. Thanks!

Thomas
Peter Korsgaard May 8, 2020, 10:06 a.m. UTC | #2 
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > On Fri, 28 Feb 2020 23:12:35 +0100
 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

 >> lz4 is available since version 3.2.0 and
 >> https://github.com/libarchive/libarchive/commit/724f3f918e509ddca60ce62fad696d7621d3623d
 >> 
 >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 >> ---
 >> package/libarchive/libarchive.mk | 7 +++++++
 >> 1 file changed, 7 insertions(+)
 >> 
 >> diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
 >> index b7ae5fb0cf..d07f0776a6 100644
 >> --- a/package/libarchive/libarchive.mk
 >> +++ b/package/libarchive/libarchive.mk
 >> @@ -78,6 +78,12 @@ else
 >> LIBARCHIVE_CONF_OPTS += --without-xml2
 >> endif
 >> 
 >> +ifeq ($(BR2_PACKAGE_LZ4),y)
 >> +LIBARCHIVE_DEPENDENCIES += lz4

 > I've added an explicit --with-lz4 here and applied. Thanks!

Committed to 2020.02.x, thanks.
diff mbox series

Patch

diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index b7ae5fb0cf..d07f0776a6 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -78,6 +78,12 @@  else
 LIBARCHIVE_CONF_OPTS += --without-xml2
 endif
 
+ifeq ($(BR2_PACKAGE_LZ4),y)
+LIBARCHIVE_DEPENDENCIES += lz4
+else
+LIBARCHIVE_CONF_OPTS += --without-lz4
+endif
+
 ifeq ($(BR2_PACKAGE_LZO),y)
 LIBARCHIVE_DEPENDENCIES += lzo
 else
@@ -130,6 +136,7 @@  HOST_LIBARCHIVE_CONF_OPTS = \
 	--without-expat \
 	--without-libiconv-prefix \
 	--without-xml2 \
+	--without-lz4 \
 	--without-lzo2 \
 	--without-mbedtls \
 	--without-nettle \