Skip to contentSkip to conversation

libxml2: depend on zlib and libiconv if appropriate

PATCH New spdawson at gmail.com 2 participants 3 messages May 14, 2013 – May 15, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libxml2: depend on zlib and libiconv if appropriate

From: Simon Dawson <[email protected]>

---
 package/libxml2/libxml2.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/libxml2/libxml2.mk +14 -0
index 6a974ef..1a98cdd 100644
@@ -34,6 +34,20 @@ 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
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+LIBXML2_DEPENDENCIES += libiconv
+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
#1 lore raw

PATCH 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>  package/libxml2/libxml2.mk | 14 ++++++++++++++

spdawson> 1 file changed, 14 insertions(+)

spdawson> diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk spdawson> index 6a974ef..1a98cdd 100644
spdawson> --- a/package/libxml2/libxml2.mk
spdawson> +++ b/package/libxml2/libxml2.mk
spdawson> @@ -34,6 +34,20 @@ else
spdawson> HOST_LIBXML2_CONF_OPT += --without-python
spdawson> endif

spdawson> +ifeq ($(BR2_PACKAGE_ZLIB),y)
spdawson> +LIBXML2_DEPENDENCIES += zlib
spdawson> +LIBXML2_CONF_OPT += --with-zlib
spdawson> +else
spdawson> +LIBXML2_CONF_OPT += --without-zlib
spdawson> +endif
spdawson> +
spdawson> +ifeq ($(BR2_PACKAGE_LIBICONV),y)
spdawson> +LIBXML2_DEPENDENCIES += libiconv
spdawson> +LIBXML2_CONF_OPT += --with-iconv
spdawson> +else
spdawson> +LIBXML2_CONF_OPT += --without-iconv
spdawson> +endif

Hmm, that seems wrong. If the toolchain has locale support, then it has iconv(), so we shouldn't disable iconv support.

Something like:

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

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 libxml2: depend on zlib and libiconv if appropriate

Quoted 12 lines · Peter Korsgaard

spdawson> +ifeq ($(BR2_PACKAGE_LIBICONV),y)
spdawson> +LIBXML2_DEPENDENCIES += libiconv
spdawson> +LIBXML2_CONF_OPT += --with-iconv
spdawson> +else
spdawson> +LIBXML2_CONF_OPT += --without-iconv
spdawson> +endif

Hmm, that seems wrong. If the toolchain has locale support, then it has iconv(), so we shouldn't disable iconv support.

Something like:

Quoted 7 lines

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

Okay; thanks Peter. Will fix and resubmit.

Simon.