mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/botan: fix build without NPTL

Browse Source 
botan unconditionally uses pthread_setname_np since bump to version
3.2.0 in commit 2f8feb6620 and
313e439c78
resulting in the following build failure:

src/lib/utils/os_utils.cpp:625:22: error: 'pthread_setname_np' was not declared in this scope
  625 |    static_cast<void>(pthread_setname_np(thread.native_handle(), name.c_str()));
      |                      ^~~~~~~~~~~~~~~~~~

So only enable threads if NPTL is available

Fixes: 2f8feb6620
 - http://autobuild.buildroot.org/results/03677de6270ff5de61fff2a76e5cd723aa34e64e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2024-03-05 13:52:56 +01:00
committed by Peter Korsgaard
parent 0ac2d5a41a
commit c944f455ad
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/botan/Config.in
View File

@@ -15,7 +15,6 @@ config BR2_PACKAGE_BOTAN
bool "botan" bool "botan"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS 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_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 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 http://botan.randombit.net
comment "botan needs a toolchain w/ C++, threads, gcc >= 10" comment "botan needs a toolchain w/ C++, gcc >= 10"
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ depends on !BR2_INSTALL_LIBSTDCPP \
|| !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || !BR2_TOOLCHAIN_GCC_AT_LEAST_10
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS

6
package/botan/botan.mk
View File

@@ -48,6 +48,12 @@ else
BOTAN_CONF_OPTS += --without-stack-protector BOTAN_CONF_OPTS += --without-stack-protector
endif 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) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy
endif endif