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 From 162797120976d5031809d8250d30596006be92f3 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Tue, 16 Mar 2021 20:30:30 +1300 Subject: Add strace 5.9, 5.10 and 5.11 Signed-off-by: Chris Packham diff --git a/packages/strace/5.10/chksum b/packages/strace/5.10/chksum new file mode 100644 index 0000000..df9a3f8 --- /dev/null +++ b/packages/strace/5.10/chksum @@ -0,0 +1,4 @@ +md5 strace-5.10.tar.xz 5f9f87f9afa282e7512f67a129287d6c +sha1 strace-5.10.tar.xz 8b5ced312f379806406a0ee6551fbe373c55e738 +sha256 strace-5.10.tar.xz fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c +sha512 strace-5.10.tar.xz 1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48 diff --git a/packages/strace/5.10/version.desc b/packages/strace/5.10/version.desc new file mode 100644 index 0000000..e69de29 diff --git a/packages/strace/5.11/chksum b/packages/strace/5.11/chksum new file mode 100644 index 0000000..4cd3ca5 --- /dev/null +++ b/packages/strace/5.11/chksum @@ -0,0 +1,4 @@ +md5 strace-5.11.tar.xz f5a317fd535465cf9130d0547661f5c4 +sha1 strace-5.11.tar.xz 1b7a533a45b9ca351d7a14702c044b917d11e979 +sha256 strace-5.11.tar.xz ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879 +sha512 strace-5.11.tar.xz 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0 diff --git a/packages/strace/5.11/version.desc b/packages/strace/5.11/version.desc new file mode 100644 index 0000000..e69de29 diff --git a/packages/strace/5.9/chksum b/packages/strace/5.9/chksum new file mode 100644 index 0000000..a8883bb --- /dev/null +++ b/packages/strace/5.9/chksum @@ -0,0 +1,4 @@ +md5 strace-5.9.tar.xz fef7264b3501c6af86224c685751d0c6 +sha1 strace-5.9.tar.xz 3b86b7c84d73415245c6b4cfa0944699dcc61c74 +sha256 strace-5.9.tar.xz 39473eb8465546c3e940fb663cb381eba5613160c7302794699d194a4d5d66d9 +sha512 strace-5.9.tar.xz f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206 diff --git a/packages/strace/5.9/version.desc b/packages/strace/5.9/version.desc new file mode 100644 index 0000000..e69de29 -- cgit v0.10.2-6-g49f6