Skip to contentSkip to conversation

zxing: don't select libiconv

PATCH New Martin Bark 2 participants 2 messages Feb 1, 2014 – Feb 2, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zxing: don't select libiconv

The zxing package currently selects libiconv when locale support is not available in the toolchain. This patch stops the zxing package selecting libiconv. The zxing package now uses uses libiconv if it's available otherwise iconv support is disabled in zxing.

---
 package/zxing/Config.in |    1 -
 package/zxing/zxing.mk  |    8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
package/zxing/Config.in +0 -1
index b69dfc9..1e04635 100644
@@ -4,7 +4,6 @@ comment "zxing needs a toolchain w/ C++"
 config BR2_PACKAGE_ZXING
 	bool "zxing"
 	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  ZXing (pronounced "zebra crossing") is an open-source,
 	  multi-format 1D/2D barcode image processing library
package/zxing/zxing.mk +7 -1
index 367a84f..5942167 100644
@@ -12,7 +12,13 @@ ZXING_LICENSE_FILES = COPYING
 ZXING_INSTALL_STAGING = YES
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
 ZXING_DEPENDENCIES += libiconv
+else
+# There is no locale support in the toolchain and libiconv
+# is not available so disable iconv support in zxing
+ZING_MAKE_OPT=CXXFLAGS+="-DNO_ICONV"
+endif
 endif
 
 define ZXING_EXTRACT_CMDS
@@ -20,7 +26,7 @@ define ZXING_EXTRACT_CMDS
 endef
 
 define ZXING_BUILD_CMDS
-	$(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS)
+	$(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPT)
 endef
 
 define ZXING_INSTALL_STAGING_CMDS
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 zxing: don't select libiconv

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Martin" == Martin Bark <[email protected]> writes:

The zxing package currently selects libiconv when locale support is not available in the toolchain. This patch stops the zxing package selecting libiconv. The zxing package now uses uses libiconv if it's available otherwise iconv support is disabled in zxing.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard