projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 30a22bf)
package/boost: fix fiber dependencies
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sun, 5 Sep 2021 18:25:08 +0000 (20:25 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sat, 11 Sep 2021 20:46:46 +0000 (22:46 +0200)
Commit d39d8f7cee9b4634e6f490020204f63fae419e8e forgot to update fiber
dependencies resulting in the following build failure:

WARNING: unmet direct dependencies detected for BR2_PACKAGE_BOOST_FILESYSTEM
  Depends on [n]: BR2_PACKAGE_BOOST [=y] && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS [=n]
  Selected by [y]:
  - BR2_PACKAGE_BOOST_FIBER [=y] && BR2_PACKAGE_BOOST [=y] && BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS [=y] && BR2_TOOLCHAIN_HAS_THREADS_NPTL [=y] && !BR2_MIPS_CPU_MIPS32 [=n] && !BR2_MIPS_CPU_MIPS64 [=n] && (BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS [=n] || BR2_TOOLCHAIN_GCC_AT_LEAST_6 [=y]) && !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 [=n]

Fixes:
 - http://autobuild.buildroot.org/results/40b8af6ce273ebd5fca56d6734f64dacd562efb1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/boost/Config.in patch | blob | history

diff --git a/package/boost/Config.in b/package/boost/Config.in
index d9ce841a929ad4cf82c60cebc24143e849dc52fa..6813ad80ae5b2e286659e242780bcbb51c2672a7 100644 (file)
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -140,8 +140,7 @@ config BR2_PACKAGE_BOOST_FIBER
        # mips support uses the "pause" instruction, only available
        # since mips32r2/mips64r2.
        depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64
-       depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-               || BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-context -> boost-thread
+       depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
        depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context
        select BR2_PACKAGE_BOOST_CONTEXT
        select BR2_PACKAGE_BOOST_FILESYSTEM
@@ -151,8 +150,7 @@ config BR2_PACKAGE_BOOST_FIBER
 
 comment "boost-fiber needs a toolchain w/ NPTL"
        depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS
-       depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \
-               || BR2_TOOLCHAIN_GCC_AT_LEAST_6
+       depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 comment "boost-fiber needs a toolchain not affected by GCC bug 64735"