| Message ID | 20191030053750.4971-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/acsccid: needs iconv | expand |
On Wed, 30 Oct 2019 06:37:50 +0100 Bernd Kuhls <bernd.kuhls@t-online.de> wrote: > 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> > --- > package/acsccid/Config.in | 1 + > package/acsccid/acsccid.mk | 4 ++++ > 2 files changed, 5 insertions(+) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Wed, 30 Oct 2019 06:37:50 +0100 > Bernd Kuhls <bernd.kuhls@t-online.de> wrote: >> 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> >> --- >> package/acsccid/Config.in | 1 + >> package/acsccid/acsccid.mk | 4 ++++ >> 2 files changed, 5 insertions(+) Committed to 2019.11.x, thanks.
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))
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> --- package/acsccid/Config.in | 1 + package/acsccid/acsccid.mk | 4 ++++ 2 files changed, 5 insertions(+)