[Buildroot] [PATCH 1/1] package/erofs-utils: add libdeflate and zlib optional dependencies

[Buildroot] [PATCH 1/1] package/erofs-utils: add libdeflate and zlib optional dependencies

[Fabrice Fontaine]

libdeflate and zlib are optional dependencies and zlib is enabled by
default since bump to version 1.7.1 in commit
f5f3d8ca007d46c1b4a351e53b619209b232b113 and
https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=29b9e71401621d3417599067a75bd9b13154c6a7:

checking for zlib... no
configure: error: Package requirements (zlib) were not met:

Package 'zlib', required by 'virtual:world', not found

Fixes: f5f3d8ca007d46c1b4a351e53b619209b232b113
 - http://autobuild.buildroot.org/results/a56d5917b5a1e8c75368349f75ec425aeba1ff15

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/erofs-utils/erofs-utils.mk | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk
index fbf7795583..f994ea9d07 100644
--- a/package/erofs-utils/erofs-utils.mk
+++ b/package/erofs-utils/erofs-utils.mk
@@ -42,8 +42,28 @@ else
 EROFS_UTILS_CONF_OPTS += --disable-fuse
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDEFLATE),y)
+EROFS_UTILS_DEPENDENCIES += libdeflate
+EROFS_UTILS_CONF_OPTS += --with-libdeflate
+else
+EROFS_UTILS_CONF_OPTS += --without-libdeflate
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+EROFS_UTILS_DEPENDENCIES += zlib
+EROFS_UTILS_CONF_OPTS += --with-zlib
+else
+EROFS_UTILS_CONF_OPTS += --without-zlib
+endif
+
 HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 host-xz
-HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4 --enable-lzma --disable-fuse --without-selinux
+HOST_EROFS_UTILS_CONF_OPTS += \
+	--enable-lz4 \
+	--enable-lzma \
+	--disable-fuse \
+	--without-libdeflate \
+	--without-selinux \
+	--without-zlib
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/erofs-utils: add libdeflate and zlib optional dependencies

[Thomas Petazzoni via buildroot]

On Mon, 22 Jul 2024 10:57:32 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> libdeflate and zlib are optional dependencies and zlib is enabled by
> default since bump to version 1.7.1 in commit
> f5f3d8ca007d46c1b4a351e53b619209b232b113 and
> https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=29b9e71401621d3417599067a75bd9b13154c6a7:
> 
> checking for zlib... no
> configure: error: Package requirements (zlib) were not met:
> 
> Package 'zlib', required by 'virtual:world', not found
> 
> Fixes: f5f3d8ca007d46c1b4a351e53b619209b232b113
>  - http://autobuild.buildroot.org/results/a56d5917b5a1e8c75368349f75ec425aeba1ff15
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/erofs-utils/erofs-utils.mk | 22 +++++++++++++++++++++-
>  1 file changed, 21 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot