From d590003e31dd0c72ef51fd7d9515af62017b0c56 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 27 May 2022 22:42:50 +0200 Subject: [PATCH] package/pcsc-lite: needs gcc >= 4.9 gcc >= 4.9 is needed since bump to version 1.9.6 in commit b02f13cd54912f3dffd0e0863378050104430d77 and https://github.com/LudovicRousseau/PCSC/commit/d56ed18dbebc4423506ce7f61d3e3bcf4bdc4cb0: In file included from winscard_clnt.c:123:0: readerfactory.h:101:3: error: unknown type name '_Atomic' _Atomic DWORD dwEventStatus; /**< Recent event that must be sent */ ^ Fixes: - http://autobuild.buildroot.org/results/189f030a2252f17abf8b819feec0003815c66e79 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/acsccid/Config.in | 2 +- package/ccid/Config.in | 2 +- package/libnfc/Config.in | 6 ++++-- package/pcsc-lite/Config.in | 6 ++++-- package/strongswan/Config.in | 4 ++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package/acsccid/Config.in b/package/acsccid/Config.in index a926be6e16..2d644ea567 100644 --- a/package/acsccid/Config.in +++ b/package/acsccid/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ACSCCID bool "acsccid" depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, pcsc-lite depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE diff --git a/package/ccid/Config.in b/package/ccid/Config.in index aae5a7181c..c12733375b 100644 --- a/package/ccid/Config.in +++ b/package/ccid/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CCID bool "ccid" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, pcsc-lite depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_PCSC_LITE diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in index ead61e4529..3686f570a9 100644 --- a/package/libnfc/Config.in +++ b/package/libnfc/Config.in @@ -13,13 +13,15 @@ config BR2_PACKAGE_LIBNFC_ACR122_PCSC depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE help support for acr112_pcsc driver -comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library" +comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBNFC_ACR122_USB bool "acr122_usb driver" diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in index 1b4d0f7d18..f4ed5ba2f0 100644 --- a/package/pcsc-lite/Config.in +++ b/package/pcsc-lite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PCSC_LITE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword help Middleware to access smart card using SCard API (PC/SC). @@ -33,6 +34,7 @@ config BR2_PACKAGE_PCSC_LITE_EMBEDDED endif -comment "pcsc-lite needs a toolchain w/ threads, dynamic library" +comment "pcsc-lite needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 430625a102..919ce1f5bc 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -108,9 +108,13 @@ config BR2_PACKAGE_STRONGSWAN_EAP_SIM_FILE config BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC bool "Enable EAP-SIM smart card backend" depends on !BR2_STATIC_LIBS # pcsc-lite + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE select BR2_PACKAGE_STRONGSWAN_EAP_SIM +comment "EAP-SIM smart backend needs a toolchain w/ dynamic library, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_STRONGSWAN_EAP_AKA bool "Enable EAP-AKA" default y if BR2_PACKAGE_STRONGSWAN_EAP # legacy