aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2019-10-30 06:37:50 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-12-08 14:31:26 +0100
commitf9bcd91e5c7f4631c14971ef29047cbd534c577a (patch)
tree1c5810f81d0fa79497ca0f28192bf62196664317
parent467f901514a5e3eb0e3518b06d1ed147a62a8c8d (diff)
downloadbuildroot-f9bcd91e5c7f4631c14971ef29047cbd534c577a.tar.gz
buildroot-f9bcd91e5c7f4631c14971ef29047cbd534c577a.tar.bz2
package/acsccid: needs iconv
Upstream commit https://github.com/acshk/acsccid/commit/5672d821ba96deb6c0c11060e4de0c9dab9b21c7 added "include <iconv.h>" Fixes: http://autobuild.buildroot.net/results/04e/04eac264718a47c550bb48b3c36314751fb4de91/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/acsccid/Config.in1
-rw-r--r--package/acsccid/acsccid.mk4
2 files changed, 5 insertions, 0 deletions
diff --git a/package/acsccid/Config.in b/package/acsccid/Config.in
index 90624ee797..74dd6de295 100644
--- a/package/acsccid/Config.in
+++ b/package/acsccid/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_ACSCCID
depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb
depends on BR2_USE_MMU # pcsc-lite
depends on !BR2_STATIC_LIBS # pcsc-lite
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_PCSC_LITE
# Even though there is a --disable-libusb option, it has in
# fact no effect, and acsccid really requires libusb.
diff --git a/package/acsccid/acsccid.mk b/package/acsccid/acsccid.mk
index abb25ac3be..28a31b95a3 100644
--- a/package/acsccid/acsccid.mk
+++ b/package/acsccid/acsccid.mk
@@ -13,4 +13,8 @@ ACSCCID_INSTALL_STAGING = YES
ACSCCID_DEPENDENCIES = pcsc-lite host-flex host-pkgconf libusb
ACSCCID_CONF_OPTS = --enable-usbdropdir=/usr/lib/pcsc/drivers
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+ACSCCID_DEPENDENCIES += libiconv
+endif
+
$(eval $(autotools-package))