From patchwork Sun Sep 8 07:49:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67753 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0A98127BBEA; Sun, 8 Sep 2024 08:50:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C98F027BBE2 for ; Sun, 8 Sep 2024 08:50:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snCgO-0001BT-AP; Sun, 08 Sep 2024 03:50:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snCgK-0001A7-Ub for guix-patches@gnu.org; Sun, 08 Sep 2024 03:50:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snCgK-0003I2-L0 for guix-patches@gnu.org; Sun, 08 Sep 2024 03:50:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=dqliHXTh1RC0/ToTR9dyiGqVysB9C8GFHqq3l7XV/Ak=; b=r24TLurYmW6do5KEz99fPf1eBBDCSEoWWycmoHsHf3eL5GX12tfZYO85hR6G7xl4q/DNL2EM3LsLUkqiHgpYgudVU2vtUwhW3bBiryhKlc8uK8tpep8KMfLRlBG9/KKld7TkSzP22to0yACWmOk2BDQS/ViruY//HXmMkqliXIDS3oj8weNMuYi+ZdKTbO/vXv6w21lz6LZT2QnljnrVKhFqR9+7u7tt6cFlE0hOyIoGtqmceMtZ5EnMC6AdMDvjpEo47aNr7v5klDeTw/s1T4NhbHj644NsEH3ju3NT3Kltj+14++rmHxeZMK9C+XfvLFZwv3bW2JiSGr0wpAvlBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snCgM-0003yd-Ec for guix-patches@gnu.org; Sun, 08 Sep 2024 03:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73118] [PATCH 2/5] Fix lib directory of arm-none-eabi libstdc++ Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 07:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73118@debbugs.gnu.org Cc: Rutherther Received: via spool by 73118-submit@debbugs.gnu.org id=B73118.172578175515151 (code B ref 73118); Sun, 08 Sep 2024 07:50:02 +0000 Received: (at 73118) by debbugs.gnu.org; 8 Sep 2024 07:49:15 +0000 Received: from localhost ([127.0.0.1]:57934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snCfb-0003wI-7B for submit@debbugs.gnu.org; Sun, 08 Sep 2024 03:49:15 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:40647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snCfZ-0003vw-5e for 73118@debbugs.gnu.org; Sun, 08 Sep 2024 03:49:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725781744; x=1726040944; bh=dqliHXTh1RC0/ToTR9dyiGqVysB9C8GFHqq3l7XV/Ak=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ng9xA4+Gd9d1vvU7h3aDHUotpwOLSAk4UI3A/GxCGOK0n+acj0SeMaFWSnctu5xnr RT37DoEm3oyLnFdeKZXTnAyqwUpLMlfT0VyfrRXogBUiAH1rnmf1BIP3aIrTs75B7r lpV3uC19hECLNqIYkH8hOQZeFSABNAVcfoMEYKKJVwWtuRQVWfZzvSZaV0tS4ey53g aYn6wRd5B+g3kHxLEv3+A0PyKXj/FZOx+BLiH42sNpMOCDL8kzX2NqSaU2JQsCUtlM Rv4B2c14aDtIBc1j2bAFxKDtsNLpMZbu9FJIv279OCd4S0gdeEZU/IpG28BB+/XfJT G/hgYuvtCrl9Q== Date: Sun, 08 Sep 2024 07:49:02 +0000 Message-ID: <6ede3b4f8ec273dc19e34f9e6d5942cf80b3c091.1725779196.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 44371c54b5dbd0c949ca8238933523949bd45f44 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The libstdc++ made for arm-none-eabi puts the contents into "lib" folder, but that's unexpected when the resulting toolchain is a cross toolchain. The folder should be "arm-none-eabi/lib" --- gnu/packages/embedded.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index a7ba9ebe98..59ffd9a661 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -481,6 +481,8 @@ (define make-libstdc++-arm-none-eabi (package (inherit libstdc++) (name "libstdc++-arm-none-eabi") + ; TODO When --libdir is specified, debug output is not produced. + (outputs '("out")) (arguments (substitute-keyword-arguments (package-arguments libstdc++) ((#:configure-flags _) @@ -493,6 +495,9 @@ (define make-libstdc++-arm-none-eabi "--disable-tls" "--disable-plugin" "--with-newlib" + ,(string-append "--libdir=" + (assoc-ref %outputs "out") + "/arm-none-eabi/lib") ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") "/arm-none-eabi/include/c++")))))