From bb19ffeaab5ba4be0a1033ca326b25d4d4e8203f Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 17 Jun 2024 18:43:26 +0000 Subject: [PATCH] package/mtd: make zlib an optional dependency Upstream changed zlib to be an optional dependency in release 2.2.0[1] See https://github.com/sigma-star/mtd-utils/commit/2465754716634422620b4577e0b7ba79c4ce1a39 Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/mtd/Config.in | 2 -- package/mtd/mtd.mk | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 9e5bb1735b..57a562c108 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -12,13 +12,11 @@ if BR2_PACKAGE_MTD config BR2_PACKAGE_MTD_JFFS_UTILS bool - select BR2_PACKAGE_ZLIB config BR2_PACKAGE_MTD_UBIFS_UTILS bool select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_ZLIB comment "MTD tools selection" diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index f790ef5ec4..fe40cf6c06 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -27,17 +27,24 @@ else MTD_CONF_OPTS += --without-lzo endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +MTD_DEPENDENCIES += zlib +MTD_CONF_OPTS += --with-zlib +else +MTD_CONF_OPTS += --without-zlib +endif + MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)" ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) -MTD_DEPENDENCIES += zlib host-pkgconf +MTD_DEPENDENCIES += host-pkgconf MTD_CONF_OPTS += --with-jffs else MTD_CONF_OPTS += --without-jffs endif ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) -MTD_DEPENDENCIES += util-linux zlib host-pkgconf +MTD_DEPENDENCIES += util-linux host-pkgconf MTD_CONF_OPTS += --with-ubifs # crypto needs linux/hash_info.h ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy)