Skip to contentSkip to conversation

package/stress-ng: disable libbsd on static build

PATCH New Baruch Siach 2 participants 2 messages Nov 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/stress-ng: disable libbsd on static build

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

Add make options that disable all libbsd tests when linking statically.

Fixes:
http://autobuild.buildroot.net/results/2c77271b33c9d0e9a39cced2eda6d0df0d6b8124/
http://autobuild.buildroot.net/results/2f98c5d9ca907dd62b30bedfe4e52b014bb3e8d1/
http://autobuild.buildroot.net/results/51c4c065b93a6d11f6b4583f80f932481518905a/

---
 package/stress-ng/stress-ng.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/stress-ng/stress-ng.mk +5 -2
index 57464e9bbff1..4afdb0a329c6 100644
@@ -10,8 +10,11 @@ STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
 STRESS_NG_LICENSE = GPL-2.0+
 STRESS_NG_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PACKAGE_LIBBSD),y)
+ifeq ($(BR2_PACKAGE_LIBBSD):$(BR2_STATIC_LIBS),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)
@@ -19,7 +22,7 @@ STRESS_NG_DEPENDENCIES += keyutils
 endif
 
 define STRESS_NG_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(STRESS_NG_MAKE_OPTS) -C $(@D)
 endef
 
 # Don't use make install otherwise stress-ng will be rebuild without
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/stress-ng: disable libbsd on static build

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

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

Add make options that disable all libbsd tests when linking statically.

Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/2c77271b33c9d0e9a39cced2eda6d0df0d6b8124/
http://autobuild.buildroot.net/results/2f98c5d9ca907dd62b30bedfe4e52b014bb3e8d1/
http://autobuild.buildroot.net/results/51c4c065b93a6d11f6b4583f80f932481518905a/

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard