package/libarchive: make optional zstd dependency explicit
PATCH 1/1 package/libarchive: make optional zstd dependency explicit
From: Thomas De Schampheleire <[email protected]>
Otherwise, the presence of zstd support in libarchive will depend on build order.
--- package/libarchive/libarchive.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/libarchive/libarchive.mk +7 -0
@@ -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 = \
Signature · 1 line
2.24.1
PATCH 1/1 package/libarchive: make optional zstd dependency explicit
El mar., 7 abr. 2020 a las 11:49, Thomas De Schampheleire (<[email protected]>) escribi?:
Quoted 30 lines
From: Thomas De Schampheleire <[email protected]>
Otherwise, the presence of zstd support in libarchive will depend on build order.
Signed-off-by Thomas De Schampheleire <[email protected]>--- package/libarchive/libarchive.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/libarchive/libarchive.mk +7
-1@@ -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 = \ --
Quoted 1 line
2.24.1
In my view this should be applied on both master and 2020.02.y.
Thomas Petazzoni
AppliedPATCH 1/1 package/libarchive: make optional zstd dependency explicit
In reply to Thomas De SchampheleireQuoted 9 lines · On Tue, 7 Apr 2020 11:49:49 +0200 Thomas De Schampheleire…
From: Thomas De Schampheleire <[email protected]>
Otherwise, the presence of zstd support in libarchive will depend on build order.
Signed-off-by Thomas De Schampheleire <[email protected]>--- package/libarchive/libarchive.mk | 7 +++++++ 1 file changed, 7 insertions(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com