]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/strace: disable libmpers with musl toolchains
authorRomain Naour <romain.naour@gmail.com>
Sat, 12 Nov 2016 15:30:12 +0000 (16:30 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 13 Nov 2016 13:26:08 +0000 (14:26 +0100)
strace bundle some kernel headers to build libmpers, this mixes userspace
headers and kernel headers which break the build with musl.
The stddef.h from gcc is used instead of the one from musl.

Disable libmpers for musl toolchains.

Fixes:
http://autobuild.buildroot.net/results/6f6/6f63fa2537ff316ba259a20966faadcf5ab9deff

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/strace/strace.mk

index 385c0029ccb1c989b336d4d6fe23cd311ad19f70..59418af855cf383b7590b2b1123bbb490eda85b1 100644 (file)
@@ -10,6 +10,14 @@ STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VE
 STRACE_LICENSE = BSD-3c
 STRACE_LICENSE_FILES = COPYING
 
+# strace bundle some kernel headers to build libmpers, this mixes userspace
+# headers and kernel headers which break the build with musl.
+# The stddef.h from gcc is used instead of the one from musl.
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+STRACE_CONF_OPTS += st_cv_m32_mpers=no \
+       st_cv_mx32_mpers=no
+endif
+
 define STRACE_REMOVE_STRACE_GRAPH
        rm -f $(TARGET_DIR)/usr/bin/strace-graph
 endef