mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-09 07:51:59 -09:00
package/bind: fix thread dependency
In commit54f96add94("package/bind: security bump version to 9.20.24") the depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL was incorrectly downgraded to BR2_TOOLCHAIN_HAS_THREADS: - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS # liburcu, libuv This is wrong because libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL. This causes unmet dependencies: WARNING: unmet direct dependencies detected for BR2_PACKAGE_LIBUV Depends on [n]: BR2_TOOLCHAIN_HAS_THREADS_NPTL [=n] && BR2_USE_MMU [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_HAS_SYNC_4 [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_BIND [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_HAS_SYNC_4 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_INSTALL_LIBSTDCPP [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] && BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS [=y] Fix that by switching back to the BR2_TOOLCHAIN_HAS_THREADS_NPTL dependency. Fixes:54f96add94("package/bind: security bump version to 9.20.24") Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commitd8dde961bc) Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
This commit is contained in:
committed by
Raphaël Mélotte
parent
d1f92ff02f
commit
4e189ef988
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BIND
|
||||
bool "bind"
|
||||
depends on BR2_USE_MMU # fork(), libcap, libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # liburcu, libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_INSTALL_LIBSTDCPP # liburcu
|
||||
depends on !BR2_STATIC_LIBS # libuv
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libuv
|
||||
@@ -48,9 +48,9 @@ config BR2_PACKAGE_BIND_TOOLS
|
||||
|
||||
endif
|
||||
|
||||
comment "bind needs a toolchain w/ threads, dynamic library, C++, gcc >= 4.9"
|
||||
comment "bind needs a toolchain w/ NPTL, dynamic library, C++, gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \
|
||||
|| BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \
|
||||
|| BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
|
||||
|
||||
Reference in New Issue
Block a user