summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-29 20:03:33 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-29 20:18:58 (GMT)
commite7584697f24d0bc6fc660703d97a38598cb76690 (patch)
tree9358b0016cd03d49f69a3778b048040493dc406e
parent96451c62fa97815b5f4f3fcc8b9765d021b6011f (diff)
downloadbuildroot-e7584697f24d0bc6fc660703d97a38598cb76690.tar.gz
buildroot-e7584697f24d0bc6fc660703d97a38598cb76690.tar.bz2
xerces: only add -liconv when locale are disabled
The iconv library can only be present when locale are disabled in the toolchain. When locale are enabled in the toolchain, iconv is directly implemented by the C library. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/xerces/xerces.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
index fd0417d..1dcc10a 100644
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -39,6 +39,10 @@ XERCES_APPS:= \
XERCES_INCLUDES:=/usr/include/xercesc
+ifneq ($(BR2_ENABLE_LOCALE),y)
+XERCES_MAKE_OPT=LIBS="-liconv"
+endif
+
$(DL_DIR)/$(XERCES_SOURCE):
$(call DOWNLOAD,$(XERCES_SITE),$(XERCES_SOURCE))
@@ -74,7 +78,7 @@ $(XERCES_DIR)/.configured: $(XERCES_DIR)/.unpacked
touch $@
$(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY): $(XERCES_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBS="-liconv" -C $(XERCES_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(XERCES_MAKE_OPT) -C $(XERCES_DIR)
$(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY): $(XERCES_DIR)/src/.libs/$(LIBXERCES_BINARY)
$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \