Commit e7584697 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 96451c62

package/xerces/xerces.mk

+5 −1
Original line number Diff line number Diff line
@@ -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) \