summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgnacy Gawędzki <ignacy.gawedzki@green-communications.fr>2015-12-26 22:35:34 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-29 17:56:20 +0100
commita7fe2ce6f499830f590177bf9a76cf144fd198dc (patch)
tree71bc7a4d3e0058f8a38d7c221408ce1f2d9f6131
parent49c4a83a081f0309780124766ccfae87dc12de3f (diff)
downloadbuildroot-a7fe2ce6f499830f590177bf9a76cf144fd198dc.tar.gz
buildroot-a7fe2ce6f499830f590177bf9a76cf144fd198dc.zip
package/gettext: host variant needs host-libxml2
Of host-gettext, we only build the tools. however some of those tools have a --color option, which needs libxml2. If the libxml2 development files are missing on the host, a bundled subset of libxml2 is used, and all seems OK. But if they ar epresent, then the host libxml2 is used. On some distros, lbxml2 is linked with liblzma. And if we happend to _then_ build our host-liblzma, we may have a conflict later when trying to run any of the host-gettext tools. Always build host-gettext with our own host-libxml2 which is not linked with liblzma. Fixes https://bugs.busybox.net/show_bug.cgi?id=7886 Signed-off-by: Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr> [nicolas: added extended commit message] Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr> [yann.morin.1998@free.fr: rebase; add comment; enhance commit log] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/gettext/gettext.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 10034d63ac..0b4e5dde94 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -12,7 +12,9 @@ GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPLv3+ (the rest)
GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB
GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
+
+# Avoid using the bundled subset of libxml2
+HOST_GETTEXT_DEPENDENCIES = host-libxml2
GETTEXT_CONF_OPTS += \
--disable-libasprintf \
OpenPOWER on IntegriCloud