NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/strace: musl on aarch64 needs headers >= 5.0

Browse Source 
strace needs headers >= 5.0 and
9966a05c7b
to avoid the following build failure on musl and aarch64 due to headers
conflict raised at least since bump to version 6.0 in commit
544806bfd8:

In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/signal.h:48,
                 from strace.c:17:
/home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/bits/signal.h:18:16: error: redefinition of 'struct sigcontext'
   18 | typedef struct sigcontext {
      |                ^~~~~~~~~~
In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/ptrace.h:26,
                 from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/linux/ptrace.h:107,
                 from ptrace.h:33,
                 from strace.c:16:
/home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/sigcontext.h:28:8: note: originally defined here
   28 | struct sigcontext {
      |        ^~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/74a480aa76970b36dcd890d9bd7a9df1d49e8e16
 - http://autobuild.buildroot.org/results/79ee8ae5fb9712fd874b56e836eca1b997c50cd9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Peter: fix architecture conditional]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2024-03-02 13:59:38 +01:00 committed by Peter Korsgaard
parent 4a71f02908
commit e2e8e655fe
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/strace/Config.in
View File

@ -4,6 +4,10 @@ config BR2_PACKAGE_STRACE
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2
# needs at least kernel headers 5.0 on xtensa
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa
# needs at least kernel headers 5.0 on musl aarch64
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || \
!(BR2_aarch64 || BR2_aarch64_be) || \
!BR2_TOOLCHAIN_USES_MUSL
depends on !BR2_RISCV_32
help
A useful diagnostic, instructional, and debugging tool.
@ -22,3 +26,8 @@ comment "strace needs a toolchain w/ headers >= 4.0 on nios2"
comment "strace needs a toolchain w/ headers >= 5.0 on xtensa"
depends on BR2_xtensa
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
comment "strace needs a musl toolchain w/ headers >= 5.0 on aarch64"
depends on BR2_aarch64 || BR2_aarch64_be
depends on BR2_TOOLCHAIN_USES_MUSL
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0