mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libbsd: needs dynamic library

Browse Source 
Static linking with libbsd fails because of multiple definition of the
strlcpy symbol. uClibc optionally provides these symbols.

So add a dependency on dynamic library to avoid a build failure with a
zeromq-enabled bitcoin or with stress-ng.

Fixes:
 - http://autobuild.buildroot.org/results/ba87544d42ad5e77a27a7a504bc6336a06f6e291

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 1edd0ac66a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2021-02-01 18:51:13 +01:00
committed by Peter Korsgaard
parent d9e2f5ad18
commit 89fffe2d77
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/fwts/Config.in
View File

@@ -6,6 +6,7 @@ config BR2_PACKAGE_FWTS
depends on BR2_USE_MMU # libglib2 depends on BR2_USE_MMU # libglib2
depends on BR2_USE_WCHAR # libglib2, libbsd depends on BR2_USE_WCHAR # libglib2, libbsd
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd
depends on !BR2_STATIC_LIBS # libbsd
depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_JSON_C select BR2_PACKAGE_JSON_C
@@ -33,10 +34,10 @@ comment "efi_runtime module needs a Linux kernel to be built"
depends on !BR2_LINUX_KERNEL depends on !BR2_LINUX_KERNEL
endif endif
comment "fwts needs a glibc toolchain w/ wchar, threads" comment "fwts needs a glibc toolchain w/ wchar, threads, dynamic library"
depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd
depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_USES_GLIBC !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS

6
package/libbsd/Config.in
View File

@@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
config BR2_PACKAGE_LIBBSD config BR2_PACKAGE_LIBBSD
bool "libbsd" bool "libbsd"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
help help
@@ -21,6 +22,7 @@ config BR2_PACKAGE_LIBBSD
http://libbsd.freedesktop.org/ http://libbsd.freedesktop.org/
comment "libbsd needs a toolchain w/ threads, wchar" comment "libbsd needs a toolchain w/ dynamic library, threads, wchar"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_USE_WCHAR

6
package/netcat-openbsd/Config.in
View File

@@ -1,6 +1,7 @@
config BR2_PACKAGE_NETCAT_OPENBSD config BR2_PACKAGE_NETCAT_OPENBSD
bool "netcat-openbsd" bool "netcat-openbsd"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
depends on !BR2_STATIC_LIBS # libbsd
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -21,8 +22,9 @@ config BR2_PACKAGE_NETCAT_OPENBSD
https://packages.debian.org/sid/netcat-openbsd https://packages.debian.org/sid/netcat-openbsd
comment "netcat-openbsd needs a glibc toolchain w/ threads, headers >= 3.12" comment "netcat-openbsd needs a glibc toolchain w/ dynamic library, threads, headers >= 3.12"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC || \ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS