* [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0
@ 2024-03-02 12:59 Fabrice Fontaine
2024-03-03 12:06 ` Peter Korsgaard
2024-03-19 12:05 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2024-03-02 12:59 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
strace needs headers >= 5.0 and
https://github.com/torvalds/linux/commit/9966a05c7b80f075f2bc7e48dbb108d3f2927234
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
544806bfd8052d05dee671c23c354e5f73f954f9:
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>
---
package/strace/Config.in | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/package/strace/Config.in b/package/strace/Config.in
index dc245c7297..cace7e129d 100644
--- a/package/strace/Config.in
+++ b/package/strace/Config.in
@@ -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
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0
2024-03-02 12:59 [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0 Fabrice Fontaine
@ 2024-03-03 12:06 ` Peter Korsgaard
2024-03-19 12:05 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2024-03-03 12:06 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> strace needs headers >= 5.0 and
> https://github.com/torvalds/linux/commit/9966a05c7b80f075f2bc7e48dbb108d3f2927234
> 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
> 544806bfd8052d05dee671c23c354e5f73f954f9:
> 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>
> ---
> package/strace/Config.in | 9 +++++++++
> 1 file changed, 9 insertions(+)
> diff --git a/package/strace/Config.in b/package/strace/Config.in
> index dc245c7297..cace7e129d 100644
> --- a/package/strace/Config.in
> +++ b/package/strace/Config.in
> @@ -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 || \
This doesn't work as BR2_aarch64 cannot be true at the same time as
BR2_aarch64_be (so with ! at least one of them are true).
I've changed it to !(BR2_aarch64 || BR2_aarch64_be) and committed,
thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0
2024-03-02 12:59 [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0 Fabrice Fontaine
2024-03-03 12:06 ` Peter Korsgaard
@ 2024-03-19 12:05 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2024-03-19 12:05 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> strace needs headers >= 5.0 and
> https://github.com/torvalds/linux/commit/9966a05c7b80f075f2bc7e48dbb108d3f2927234
> 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
> 544806bfd8052d05dee671c23c354e5f73f954f9:
> 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>
Committed to 2023.02.x and 2023.11.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-19 12:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-02 12:59 [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0 Fabrice Fontaine
2024-03-03 12:06 ` Peter Korsgaard
2024-03-19 12:05 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox