From fb426ac912f46889548a863a50a310b8d359307e Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 14 Jan 2017 16:38:52 -0800 Subject: Replace strace workaround with a patch. The correct solution was checked in to strace GIT; will be part of the next release. Backport patch to 4.10..4.15, and remove the workaround from 500-strace.sh. Versions 4.9 and older should build fine even without the workaround (they would be picking up wrong definitions, but they need different patch and I don't feel like spending any time on these versions). Signed-off-by: Alexey Neyman --- scripts/build/debug/500-strace.sh | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'scripts/build/debug') diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index da0e2f58..2d8c7df5 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -15,22 +15,10 @@ do_debug_strace_extract() { do_debug_strace_build() { CT_DoStep INFO "Installing strace" - # Strace needs _IOC definitions, and it tries to pick them up from . - # While cross-compiling on a non-Linux host, we don't have this header. Replacing - # with , as suggested by many internet "solutions", - # is wrong: for example, MacOS defines _IOC macros differently, and we need the - # definitions for the target! - # Hence, create a "window" into target includes. - CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}/build-strace-headers" - for d in linux asm asm-generic; do - CT_DoExecLog ALL ln -sf "${CT_HEADERS_DIR}/${d}" "${CT_BUILD_DIR}/build-strace-headers/${d}" - done - CT_mkdir_pushd "${CT_BUILD_DIR}/build-strace" CT_DoLog EXTRA "Configuring strace" CT_DoExecLog CFG \ - CFLAGS_FOR_BUILD="-I ${CT_BUILD_DIR}/build-strace-headers" \ CC="${CT_TARGET}-${CT_CC}" \ CPP="${CT_TARGET}-cpp" \ LD="${CT_TARGET}-ld" \ -- cgit v1.2.3