diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
| commit | 074b6689e81d5bc4abf08d63dc8086b9cc41a078 (patch) | |
| tree | 8cff99d679b7260a54cebac38af0764b16394b71 /package/xerces | |
| parent | 18abd4aa94cd59240b90257c95877c0ea2fd1796 (diff) | |
| parent | e7584697f24d0bc6fc660703d97a38598cb76690 (diff) | |
| download | buildroot-novena-074b6689e81d5bc4abf08d63dc8086b9cc41a078.tar.gz buildroot-novena-074b6689e81d5bc4abf08d63dc8086b9cc41a078.zip | |
Merge branch 'fixes-20100729' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/xerces')
| -rw-r--r-- | package/xerces/Config.in | 2 | ||||
| -rw-r--r-- | package/xerces/xerces.mk | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/package/xerces/Config.in b/package/xerces/Config.in index 85bd96cf1..123f0c166 100644 --- a/package/xerces/Config.in +++ b/package/xerces/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_XERCES bool "xerces-c++" depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBICONV + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help Xerces-C++ is a validating XML parser written in portable C++. diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 9f77be6f7..1dcc10a1f 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 @@ -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) \ @@ -87,7 +91,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) |