mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/mtd: make zlib an optional dependency

Browse Source 
Upstream changed zlib to be an optional dependency in release 2.2.0[1]

See 2465754716

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Brandon Maier
2024-06-17 18:43:26 +00:00
committed by Arnout Vandecappelle
parent 8aa7d057a7
commit bb19ffeaab
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/mtd/Config.in
View File

@@ -12,13 +12,11 @@ if BR2_PACKAGE_MTD
config BR2_PACKAGE_MTD_JFFS_UTILS config BR2_PACKAGE_MTD_JFFS_UTILS
bool bool
select BR2_PACKAGE_ZLIB
config BR2_PACKAGE_MTD_UBIFS_UTILS config BR2_PACKAGE_MTD_UBIFS_UTILS
bool bool
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_ZLIB
comment "MTD tools selection" comment "MTD tools selection"

11
package/mtd/mtd.mk
View File

@@ -27,17 +27,24 @@ else
MTD_CONF_OPTS += --without-lzo MTD_CONF_OPTS += --without-lzo
endif 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)" MTD_CONF_ENV += LDFLAGS="$(MTD_LDFLAGS)"
ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y) ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y)
MTD_DEPENDENCIES += zlib host-pkgconf MTD_DEPENDENCIES += host-pkgconf
MTD_CONF_OPTS += --with-jffs MTD_CONF_OPTS += --with-jffs
else else
MTD_CONF_OPTS += --without-jffs MTD_CONF_OPTS += --without-jffs
endif endif
ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y) 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 MTD_CONF_OPTS += --with-ubifs
# crypto needs linux/hash_info.h # crypto needs linux/hash_info.h
ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy) ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12)$(BR2_PACKAGE_OPENSSL),yy)