diff --git a/package/botan/Config.in b/package/botan/Config.in index 5c3f31726e..c74128bb9d 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 - depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -24,7 +23,7 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, threads, gcc >= 10" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ +comment "botan needs a toolchain w/ C++, gcc >= 10" + depends on !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 88dbfa5807..95352ea41b 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -48,6 +48,12 @@ else BOTAN_CONF_OPTS += --without-stack-protector endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +BOTAN_CONF_OPTS += --with-os-feature=threads +else +BOTAN_CONF_OPTS += --without-os-feature=threads +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif