* [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build"
@ 2021-02-01 17:51 Fabrice Fontaine
2021-02-01 17:51 ` [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2021-02-01 17:51 UTC (permalink / raw)
To: buildroot
This reverts commit f2d6c5ff9092aa7735c7a739d15180910ae734df.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/stress-ng/stress-ng.mk | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
index c26206cd2e..53d7b7e5b7 100644
--- a/package/stress-ng/stress-ng.mk
+++ b/package/stress-ng/stress-ng.mk
@@ -10,11 +10,8 @@ STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng
STRESS_NG_LICENSE = GPL-2.0+
STRESS_NG_LICENSE_FILES = COPYING
-ifeq ($(BR2_PACKAGE_LIBBSD):$(BR2_STATIC_LIBS),y:)
+ifeq ($(BR2_PACKAGE_LIBBSD),y)
STRESS_NG_DEPENDENCIES += libbsd
-else
-STRESS_NG_MAKE_OPTS += HAVE_LIB_BSD=0 HAVE_WCSLCAT=0 \
- HAVE_WCSLCPY=0 HAVE_SETPROCTITLE=0
endif
ifeq ($(BR2_PACKAGE_KEYUTILS),y)
@@ -22,7 +19,7 @@ STRESS_NG_DEPENDENCIES += keyutils
endif
define STRESS_NG_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) $(STRESS_NG_MAKE_OPTS) -C $(@D)
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
endef
# Don't use make install otherwise stress-ng will be rebuild without
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library
2021-02-01 17:51 [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Fabrice Fontaine
@ 2021-02-01 17:51 ` Fabrice Fontaine
2021-02-04 16:57 ` Peter Korsgaard
2021-02-04 16:59 ` Peter Korsgaard
2021-02-02 21:50 ` [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Yann E. MORIN
2021-02-04 16:59 ` Peter Korsgaard
2 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2021-02-01 17:51 UTC (permalink / raw)
To: buildroot
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>
---
package/fwts/Config.in | 5 +++--
package/libbsd/Config.in | 6 ++++--
package/netcat-openbsd/Config.in | 6 ++++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/package/fwts/Config.in b/package/fwts/Config.in
index ff28a4a403..ac9a2e3909 100644
--- a/package/fwts/Config.in
+++ b/package/fwts/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_FWTS
depends on BR2_USE_MMU # libglib2
depends on BR2_USE_WCHAR # libglib2, libbsd
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd
+ depends on !BR2_STATIC_LIBS # libbsd
depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBBSD
@@ -31,9 +32,9 @@ comment "efi_runtime module needs a Linux kernel to be built"
depends on !BR2_LINUX_KERNEL
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_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_USES_GLIBC
+ !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS
diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in
index e54f5e6f23..845a22162b 100644
--- a/package/libbsd/Config.in
+++ b/package/libbsd/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
config BR2_PACKAGE_LIBBSD
bool "libbsd"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
+ depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_WCHAR
help
@@ -21,6 +22,7 @@ config BR2_PACKAGE_LIBBSD
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_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+ depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_USE_WCHAR
diff --git a/package/netcat-openbsd/Config.in b/package/netcat-openbsd/Config.in
index 4734ff9901..beaa8ed451 100644
--- a/package/netcat-openbsd/Config.in
+++ b/package/netcat-openbsd/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_NETCAT_OPENBSD
bool "netcat-openbsd"
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
+ depends on !BR2_STATIC_LIBS # libbsd
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -21,8 +22,9 @@ config BR2_PACKAGE_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_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
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build"
2021-02-01 17:51 [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Fabrice Fontaine
2021-02-01 17:51 ` [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library Fabrice Fontaine
@ 2021-02-02 21:50 ` Yann E. MORIN
2021-02-04 16:59 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2021-02-02 21:50 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2021-02-01 18:51 +0100, Fabrice Fontaine spake thusly:
> This reverts commit f2d6c5ff9092aa7735c7a739d15180910ae734df.
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Series of applied to master, thanks.
I however inverted the patch order. Indeed, if we do the revert before
the static condition, then there is a window during which stess-ng will
not build again. With the static condition first, then we can safely
revert.
Regards,
Yann E. MORIN.
> ---
> package/stress-ng/stress-ng.mk | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
> index c26206cd2e..53d7b7e5b7 100644
> --- a/package/stress-ng/stress-ng.mk
> +++ b/package/stress-ng/stress-ng.mk
> @@ -10,11 +10,8 @@ STRESS_NG_SITE = https://kernel.ubuntu.com/~cking/tarballs/stress-ng
> STRESS_NG_LICENSE = GPL-2.0+
> STRESS_NG_LICENSE_FILES = COPYING
>
> -ifeq ($(BR2_PACKAGE_LIBBSD):$(BR2_STATIC_LIBS),y:)
> +ifeq ($(BR2_PACKAGE_LIBBSD),y)
> STRESS_NG_DEPENDENCIES += libbsd
> -else
> -STRESS_NG_MAKE_OPTS += HAVE_LIB_BSD=0 HAVE_WCSLCAT=0 \
> - HAVE_WCSLCPY=0 HAVE_SETPROCTITLE=0
> endif
>
> ifeq ($(BR2_PACKAGE_KEYUTILS),y)
> @@ -22,7 +19,7 @@ STRESS_NG_DEPENDENCIES += keyutils
> endif
>
> define STRESS_NG_BUILD_CMDS
> - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(STRESS_NG_MAKE_OPTS) -C $(@D)
> + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
> endef
>
> # Don't use make install otherwise stress-ng will be rebuild without
> --
> 2.29.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library
2021-02-01 17:51 ` [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library Fabrice Fontaine
@ 2021-02-04 16:57 ` Peter Korsgaard
2021-02-04 16:59 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2021-02-04 16:57 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> 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>
> ---
> package/fwts/Config.in | 5 +++--
> package/libbsd/Config.in | 6 ++++--
> package/netcat-openbsd/Config.in | 6 ++++--
> 3 files changed, 11 insertions(+), 6 deletions(-)
> diff --git a/package/fwts/Config.in b/package/fwts/Config.in
> index ff28a4a403..ac9a2e3909 100644
> --- a/package/fwts/Config.in
> +++ b/package/fwts/Config.in
> @@ -5,6 +5,7 @@ config BR2_PACKAGE_FWTS
> depends on BR2_USE_MMU # libglib2
> depends on BR2_USE_WCHAR # libglib2, libbsd
> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd
> + depends on !BR2_STATIC_LIBS # libbsd
> depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h
> select BR2_PACKAGE_LIBGLIB2
> select BR2_PACKAGE_LIBBSD
> @@ -31,9 +32,9 @@ comment "efi_runtime module needs a Linux kernel to be built"
> depends on !BR2_LINUX_KERNEL
> endif
> -comment "fwts needs a glibc toolchain w/ wchar, threads"
> +comment "fwts needs a glibc toolchain w/ wchar, threads, dynamic library"
..
> -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"
These comments are a bit silly given that glibc implies dynamic, but OK.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library
2021-02-01 17:51 ` [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library Fabrice Fontaine
2021-02-04 16:57 ` Peter Korsgaard
@ 2021-02-04 16:59 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2021-02-04 16:59 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> 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>
Committed to 2020.02.x and 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build"
2021-02-01 17:51 [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Fabrice Fontaine
2021-02-01 17:51 ` [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library Fabrice Fontaine
2021-02-02 21:50 ` [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Yann E. MORIN
@ 2021-02-04 16:59 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2021-02-04 16:59 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> This reverts commit f2d6c5ff9092aa7735c7a739d15180910ae734df.
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-04 16:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-01 17:51 [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Fabrice Fontaine
2021-02-01 17:51 ` [Buildroot] [PATCH 2/2] package/libbsd: needs dynamic library Fabrice Fontaine
2021-02-04 16:57 ` Peter Korsgaard
2021-02-04 16:59 ` Peter Korsgaard
2021-02-02 21:50 ` [Buildroot] [PATCH 1/2] Revert "package/stress-ng: disable libbsd on static build" Yann E. MORIN
2021-02-04 16:59 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.