From: Romain Naour Date: Sat, 12 Nov 2016 15:30:12 +0000 (+0100) Subject: package/strace: disable libmpers with musl toolchains X-Git-Tag: 2016.11-rc2~7 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/coffee/buildroot.git/commitdiff_plain/7892a778b?hp=064004ae9df23c9671673a9ae1f7b2d1042c15ee package/strace: disable libmpers with musl toolchains 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 Signed-off-by: Thomas Petazzoni --- diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 385c0029cc..59418af855 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -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