libxml2: depend on zlib and libiconv if appropriate
PATCH v2 1/1 libxml2: depend on zlib and libiconv if appropriate
From: Simon Dawson <[email protected]>
Signed-off-by Simon Dawson <[email protected]>
---
v2: As suggested by Peter Korsgaard, correct iconv handling to cope with the case where iconv() is provided by the toolchain, rather than by libiconv.
package/libxml2/libxml2.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
package/libxml2/libxml2.mk +15 -0
@@ -34,6 +34,21 @@ else HOST_LIBXML2_CONF_OPT += --without-python endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBXML2_DEPENDENCIES += zlib +LIBXML2_CONF_OPT += --with-zlib +else +LIBXML2_CONF_OPT += --without-zlib +endif + +LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) + +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) +LIBXML2_CONF_OPT += --with-iconv +else +LIBXML2_CONF_OPT += --without-iconv +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package))
Signature · 1 line
1.8.1.2
PATCH v2 1/1 libxml2: depend on zlib and libiconv if appropriate
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"spdawson" == spdawson <[email protected]> writes:
spdawson> From: Simon Dawson <[email protected]> spdawson> Signed-off-by: Simon Dawson <[email protected]>
spdawson> ---
spdawson> v2: As suggested by Peter Korsgaard, correct iconv handling spdawson> to cope with the case where iconv() is provided by the spdawson> toolchain, rather than by libiconv.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard