From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D887BC48BF6 for ; Sun, 3 Mar 2024 12:06:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 802F2820A8; Sun, 3 Mar 2024 12:06:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5lT_36ExzfIk; Sun, 3 Mar 2024 12:06:44 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9A54081EF0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 9A54081EF0; Sun, 3 Mar 2024 12:06:44 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0B2381BF34A for ; Sun, 3 Mar 2024 12:06:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2E022403F8 for ; Sun, 3 Mar 2024 12:06:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zPkCZsnP2alC for ; Sun, 3 Mar 2024 12:06:39 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.183.194; helo=relay2-d.mail.gandi.net; envelope-from=peter@korsgaard.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 5DCAE40494 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5DCAE40494 Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5DCAE40494 for ; Sun, 3 Mar 2024 12:06:37 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id B311940003; Sun, 3 Mar 2024 12:06:33 +0000 (UTC) Received: from peko by dell.be.48ers.dk with local (Exim 4.96) (envelope-from ) id 1rgkbx-0084WL-03; Sun, 03 Mar 2024 13:06:33 +0100 From: Peter Korsgaard To: Fabrice Fontaine References: <20240302125938.790570-1-fontaine.fabrice@gmail.com> Date: Sun, 03 Mar 2024 13:06:32 +0100 In-Reply-To: <20240302125938.790570-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 2 Mar 2024 13:59:38 +0100") Message-ID: <87sf174j07.fsf@48ers.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-GND-Sasl: peter@korsgaard.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Subject: Re: [Buildroot] [PATCH 1/1] package/strace: musl on aarch64 needs headers >= 5.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: buildroot@buildroot.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" >>>>> "Fabrice" == Fabrice Fontaine 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 > --- > 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