From aad29b55a8851dec26399e37f2b87c0b38c98fc3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 29 Jul 2010 09:49:42 +0200 Subject: xerces: fix dependency on iconv All "select BR2_PACKAGE_LIBICONV" must use the "if !BR2_ENABLE_LOCALE" condition, otherwise we can end up with a toolchain suppoting locales *and* the libiconv package being compiled, which confuses other packages. Example with glib: gconvert.c:52:2: error: #error GNU libiconv in use but included iconv.h not from libiconv In addition to that, in xerces.mk, we add the dependency on libiconv when it is available, to make sure it gets compiled before xerces. Signed-off-by: Thomas Petazzoni --- package/xerces/xerces.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xerces/xerces.mk') diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 9f77be6f7..8a1f693a2 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -87,7 +87,7 @@ $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY): $(STAGING_DIR)/usr/lib/$(LIBXERCES_BI cp -a $(STAGING_DIR)/usr/lib/$(LIBXERCES_BINARY)* $(TARGET_DIR)/usr/lib $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY) -xerces: $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY) +xerces: $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/usr/lib/$(LIBXERCES_BINARY) xerces-bin: $(XERCES_DIR)/usr/lib/$(LIBXERCES_BINARY) -- cgit v1.2.3 From 96451c62fa97815b5f4f3fcc8b9765d021b6011f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 29 Jul 2010 21:52:18 +0200 Subject: xerces: fix download location apache.jumper.nu does not work anymore, so use archive.apache.org instead. Signed-off-by: Thomas Petazzoni --- package/xerces/xerces.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xerces/xerces.mk') diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 8a1f693a2..fd0417d26 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -5,7 +5,7 @@ ############################################################# XERCES_VERSION:=3.0.1 XERCES_SOURCE:=xerces-c-$(XERCES_VERSION).tar.gz -XERCES_SITE:=http://apache.jumper.nu/xerces/c/3/sources/ +XERCES_SITE:=http://archive.apache.org/dist/xerces/c/3/sources/ XERCES_CAT:=$(ZCAT) XERCES_DIR:=$(BUILD_DIR)/xerces-c-$(XERCES_VERSION) LIBXERCES_BINARY:=libxerces-c-3.0.so -- cgit v1.2.3 From e7584697f24d0bc6fc660703d97a38598cb76690 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 29 Jul 2010 22:03:33 +0200 Subject: 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 --- package/xerces/xerces.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'package/xerces/xerces.mk') diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index fd0417d26..1dcc10a1f 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) \ -- cgit v1.2.3