From 3fa241a4e19e30e4850d5ea105b01c469a22fb02 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Tue, 30 Mar 2021 12:52:12 +1300 Subject: build: debug: strace: Add -D__USE_MISC to target CFLAGS Similar to commit ca45a8f9 ("Add -D__GLIBC__ to target CFLAGS") newer versions of strace bundle the kernel headers which cause build errors such as: [ALL ] In file included from /home/x-tool/.build/arm-unknown-linux-musleabi/src/strace/bundled/linux/include/uapi/linux/in6.h:26, [ALL ] from /home/x-tool/.build/arm-unknown-linux-musleabi/src/strace/bundled/linux/include/uapi/linux/if_bridge.h:19, [ALL ] from /home/x-tool/.build/arm-unknown-linux-musleabi/src/strace/src/rtnl_mdb.c:16: [ERROR] /home/x-tool/.build/arm-unknown-linux-musleabi/src/strace/bundled/linux/include/uapi/linux/libc-compat.h:109: error: "__UAPI_DEF_IN6_ADDR_ALT" redefined [-Werror] [ALL ] 109 | #define __UAPI_DEF_IN6_ADDR_ALT 1 [ALL ] | [ALL ] In file included from /home/x-tool/.build/arm-unknown-linux-musleabi/src/strace/src/rtnl_mdb.c:15: [ALL ] /home/x-tool/x-tools/arm-unknown-linux-musleabi/arm-unknown-linux-musleabi/sysroot/usr/include/netinet/in.h:401: note: this is the location of the previous definition [ALL ] 401 | #define __UAPI_DEF_IN6_ADDR_ALT 0 [ALL ] | [ALL ] cc1: all warnings being treated as errors By defining __USE_MISC we get __UAPI_DEF_IN6_ADDR_ALT defined in a compatible manner. Signed-off-by: Chris Packham diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index 4f6d6aa..c28af35 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -21,7 +21,7 @@ do_debug_strace_build() # and . Kernel's libc-compat.h # only cares about GLIBC. uClibc-ng does the same # internally, pretending it's GLIBC for kernel headers inclusion. - cflags+=" -D__GLIBC__" + cflags+=" -D__GLIBC__ -D__USE_MISC" fi CT_mkdir_pushd "${CT_BUILD_DIR}/build-strace" -- cgit v0.10.2-6-g49f6