diff mbox series

package/libarchive: make optional zstd dependency explicit

Message ID 20200407094949.23467-1-patrickdepinguin@gmail.com
State Accepted
Headers show
Series package/libarchive: make optional zstd dependency explicit | expand

Commit Message

Thomas De Schampheleire April 7, 2020, 9:49 a.m. UTC 
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>

Otherwise, the presence of zstd support in libarchive will depend on build
order.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/libarchive/libarchive.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Thomas De Schampheleire April 7, 2020, 10 a.m. UTC | #1 
El mar., 7 abr. 2020 a las 11:49, Thomas De Schampheleire
(<patrickdepinguin@gmail.com>) escribió:
>
> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
>
> Otherwise, the presence of zstd support in libarchive will depend on build
> order.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ---
>  package/libarchive/libarchive.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
> index 60838eea0a..94f974e7d1 100644
> --- a/package/libarchive/libarchive.mk
> +++ b/package/libarchive/libarchive.mk
> @@ -112,6 +112,13 @@ else
>  LIBARCHIVE_CONF_OPTS += --without-lzma
>  endif
>
> +ifeq ($(BR2_PACKAGE_ZSTD),y)
> +LIBARCHIVE_DEPENDENCIES += zstd
> +LIBARCHIVE_CONF_OPTS += --with-zstd
> +else
> +LIBARCHIVE_CONF_OPTS += --without-zstd
> +endif
> +
>  # The only user of host-libarchive needs zlib support
>  HOST_LIBARCHIVE_DEPENDENCIES = host-zlib
>  HOST_LIBARCHIVE_CONF_OPTS = \
> --
> 2.24.1

In my view this should be applied on both master and 2020.02.y.
Thomas Petazzoni April 8, 2020, 8:52 p.m. UTC | #2 
On Tue,  7 Apr 2020 11:49:49 +0200
Thomas De Schampheleire <patrickdepinguin@gmail.com> wrote:

> From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> 
> Otherwise, the presence of zstd support in libarchive will depend on build
> order.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
> ---
>  package/libarchive/libarchive.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 60838eea0a..94f974e7d1 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -112,6 +112,13 @@  else
 LIBARCHIVE_CONF_OPTS += --without-lzma
 endif
 
+ifeq ($(BR2_PACKAGE_ZSTD),y)
+LIBARCHIVE_DEPENDENCIES += zstd
+LIBARCHIVE_CONF_OPTS += --with-zstd
+else
+LIBARCHIVE_CONF_OPTS += --without-zstd
+endif
+
 # The only user of host-libarchive needs zlib support
 HOST_LIBARCHIVE_DEPENDENCIES = host-zlib
 HOST_LIBARCHIVE_CONF_OPTS = \