From patchwork Mon Jun 14 15:37:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30262 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 003F027BC81; Mon, 14 Jun 2021 17:01:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9CB6327BC78 for ; Mon, 14 Jun 2021 17:01:23 +0100 (BST) Received: from localhost ([::1]:38300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp1e-0000tg-J1 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:01:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof5-0008Jh-31 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35999) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof4-00077b-PH for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof4-0004Di-Nj for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 01/37] utils: Define target-linux? predicate. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368503916035 (code B ref 49025); Mon, 14 Jun 2021 15:38:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:19 +0000 Received: from localhost ([127.0.0.1]:47503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeN-0004AZ-2R for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:19 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeL-0004AR-Gm for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:18 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3dG250020mfAB4063dGr2; Mon, 14 Jun 2021 17:37:16 +0200 Message-ID: <1006ad56f7750b41a6566edc2310105b80434aef.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:16 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685036; bh=O3dLFRNgrcLOgQ05ElriE16zWpQ323uQya/Y3etXMcg=; h=Subject:From:To:Date:In-Reply-To:References; b=Y0PBhrUQRLo5Fx/mqii8n9z21RomunWGj/BeBWtt1tx24htP+WrFhBqi2zieNnQk8 1IEcfYBxZFDfoR53uYrf8NqLjkMWmY1ev1pCw/bi088qxeUn63BSRdptRKgFC0BerD QuuwDPRlNzwnSx7pFE+WOkrn2Dvpxo+fJehtm1e5zkZmKW0tsnNEyCsp9pKmIOppsl VI4YAanrSV0wkpUAVWDmoxPobGtmMBxKEnNWuWcOtZRCYvF2Sq0JVYxBzp+5ejS/fc e1Z2eq2odUHFLjmFJZNeD5gnakgdwdX/5meObBNq0WNI5sgswTzbZ+q4DMl80ajAxJ 2ZdoMt5dblG6w== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-linux?): New predicate. * tests/utils.scm ("target-linux?"): Test it. ("target-mingw?"): Also test ‘target-mingw?’. --- guix/utils.scm | 6 ++++++ tests/utils.scm | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 19990ceb8a..4ff2602e23 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Chris Marusich +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,6 +82,7 @@ %current-system %current-target-system package-name->name+version + target-linux? target-mingw? target-arm32? target-aarch64? @@ -543,6 +545,10 @@ a character other than '@'." (idx (values (substring spec 0 idx) (substring spec (1+ idx)))))) +(define* (target-linux? #:optional (target (or (%current-target-system) + (%current-system)))) + (string-contains target "linux")) + (define* (target-mingw? #:optional (target (%current-target-system))) (and target (string-suffix? "-mingw32" target))) diff --git a/tests/utils.scm b/tests/utils.scm index 7fcbb25552..80a0e669a4 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -289,6 +290,22 @@ skip these tests." (string-closest "hello" '("kikoo" "helo" "hihihi" "halo")) (string-closest "hello" '("aaaaa" "12345" "hellohello" "h")))) +(test-equal "target-linux?" + '(#t #f #f #t) + (map (compose ->bool target-linux?) + '("i686-linux-gnu" "i686-w64-mingw32" + ;; Checking that "gnu" is present is not sufficient, + ;; as GNU/Hurd exists. + "i686-pc-gnu" + ;; Some targets have a suffix. + "arm-linux-gnueabihf"))) + +(test-equal "target-mingw?" + '(#f #f #t) + (map (compose ->bool target-mingw?) + '("i686-linux-gnu" "i686-pc-gnu" + "i686-w64-mingw32"))) + (test-end) (false-if-exception (delete-file temp-file)) From patchwork Mon Jun 14 15:39:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30267 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 5910D27BC81; Mon, 14 Jun 2021 17:02:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A91527BC78 for ; Mon, 14 Jun 2021 17:02:34 +0100 (BST) Received: from localhost ([::1]:41874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp2n-0003HS-4e for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:02:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh3-0006rF-31 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0008MY-KR for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh2-0004Mz-I0 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 02/37] utils: Define a target-x86-32? and target-x86-64? predicate. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368518516735 (code B ref 49025); Mon, 14 Jun 2021 15:40:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:45 +0000 Received: from localhost ([127.0.0.1]:47652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogj-0004Lr-EN for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:45 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:49724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogZ-0004Kz-HE for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:44 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3fa2500E0mfAB4013fbl3; Mon, 14 Jun 2021 17:39:35 +0200 Message-ID: <0e7d032a02bca4bc6d3b3b1a3936f039f7f56da5.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:34 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685175; bh=n2Dy1NxqjV2Du24S0QoUHh5TG8tI/tG4wLxZmJOGW9M=; h=Subject:From:To:Date:In-Reply-To:References; b=TVE15dkFGDanURXkTumxinmgWzMlKDNCj4Xd/ddNxOtB6Ojpl694YZ1YLgrvz0o0J Lu8x+BdqNzo/t3UezkT0VpDpKy04sYrMd54RJdS2pKjfsfHQcCmlin/zFE5Z/jwXcq Ls0qPN/RoJmy4JSMbawT0uWEIX/JnfRHsttp9xBC8bcDpL7Pw9Wmkhbb59SODBCha3 0ypW3YvMHmOXaUPSid3TeVRH+QgOKs1py4woONOqo56telV761oTUB/cOKDRfG8HF0 XjOcwmvuXnb2XXLtq+W9Hjgc4NxD89nQovS1jnjQmuZO+iiVwsyX561Wue/DSIf6HW 4uWfl0WyaliLA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-x86-32?, target-x86-64?): New predicates. * tests/utils.scm ("target-x86-32?", "target-x86-64?"): New tests. --- guix/utils.scm | 20 ++++++++++++++++++++ tests/utils.scm | 23 +++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index 4ff2602e23..2256ea2ca6 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -84,6 +84,8 @@ package-name->name+version target-linux? target-mingw? + target-x86-32? + target-x86-64? target-arm32? target-aarch64? target-arm? @@ -553,6 +555,24 @@ a character other than '@'." (and target (string-suffix? "-mingw32" target))) +(define* (target-x86-32? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET a variant of Intel's 32-bit architecture +(IA32)?" + ;; Intel also has a 16-bit architecture in the iN86 series, i286 + ;; (see, e.g. https://en.wikipedia.org/wiki/Intel/808286) so this + ;; procedure is not named target-x86?. + (or (string-prefix? "i386-" target) + (string-prefix? "i486-" target) + (string-prefix? "i586-" target) + (string-prefix? "i686-" target))) + +(define* (target-x86-64? #:optional (target (or (%current-target-system) + (%current-system)))) + "Is the architecture of TARGET a variant of Intel/AMD's 64-bit +architecture (x86_64)?" + (string-prefix? "x86_64-" target)) + (define* (target-arm32? #:optional (target (or (%current-target-system) (%current-system)))) (string-prefix? "arm" target)) diff --git a/tests/utils.scm b/tests/utils.scm index 80a0e669a4..92439b5587 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -306,6 +306,29 @@ skip these tests." '("i686-linux-gnu" "i686-pc-gnu" "i686-w64-mingw32"))) +(test-equal "target-x86-32?" + '(#f #f #f #t #t #t #t #f) + ;; These are (according to Wikipedia) two RISC architectures + ;; by Intel and presumably not compatible with the x86-32 series. + (map target-x86-32? + '("i860-gnu" "i960-gnu" + ;; This is a 16-bit architecture + "i286-gnu" + ;; These are part of the x86-32 series. + "i386-gnu" "i486-gnu" "i586-gnu" "i686-gnu" + ;; Maybe this one will exist some day, but not yet. + "i786-gnu"))) + +(test-equal "target-x86-64?" + '(#t #f #f #f) + (map target-x86-64? + `("x86_64-linux-gnu" "i386-linux-gnu" + ;; Just because it includes "64" doesn't make it 64-bit. + "aarch64-linux-gnu" + ;; Note that (expt 2 109) in decimal notation starts with 64. + ;; However, it isn't 32-bit. + ,(format #f "x86_~a-linux-gnu" (expt 2 109))))) + (test-end) (false-if-exception (delete-file temp-file)) From patchwork Mon Jun 14 15:37:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30263 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 E8EAB27BC81; Mon, 14 Jun 2021 17:01:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 774C127BC78 for ; Mon, 14 Jun 2021 17:01:36 +0100 (BST) Received: from localhost ([::1]:39250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp1r-0001Uk-Ds for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:01:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof5-0008LK-FV for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36000) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof5-00077k-5f for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof5-0004Dp-47 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 03/37] packages: Define this-package-input and this-package-native-input. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368504416052 (code B ref 49025); Mon, 14 Jun 2021 15:38:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:24 +0000 Received: from localhost ([127.0.0.1]:47507 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeR-0004Aq-G0 for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:23 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeP-0004Ah-78 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:21 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3dK2500Q0mfAB4063dL7F; Mon, 14 Jun 2021 17:37:20 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:19 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685040; bh=gxbilsOjCrADWcUWiU6E8vOBaNo7+d1LXmx/BF1mapI=; h=Subject:From:To:Date:In-Reply-To:References; b=Xk/Kh/fopx4WO50aJ3mMeBos+tfC8pnZWRG2lTsU5dXfMefTKyFP0JpDDrKmCfSga qIOgxaRpNLWHX6hTyDtdIXTsL8BLp2Eq1JNJ8+imjkaSZRujDuz6oO7oBCa0nfDTUf 5tU9t6UvSODXbJIscuzEVtlyKp3RUgU+otcurQ5SLqBh8FkSgwgyuDUXvyhrZZYZKb 1uunDYG/9kiwBMj2PeMTGmkHTswO1Bdfmm8cV8wfuRbH6ucQ8XRMD/imoZ8kHUMoMX fvrXV0n8+5h6W7a9zwxURAm9uavAJl+jghNbQS7ulgwLC0pEVvv10ir2B5G3reYoX1 ZIFht05lm5vDw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches These macros are intended to be used in build phases. More precisely, (assoc-ref %build-inputs "input") can be replaced by #$(this-package-input "input") or #+(this-package-native-input "native-input") as appropriate. * guix/packages.scm (package-input, package-native-input): New (unexported) procedures. (this-package-input, this-package-native-input): New macros. --- guix/packages.scm | 29 +++++++++++++++++++++++++++++ tests/packages.scm | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index a66dbea1b7..80c8bbebf0 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -108,6 +108,9 @@ deprecated-package package-field-location + this-package-input + this-package-native-input + package-direct-sources package-transitive-sources package-direct-inputs @@ -513,6 +516,32 @@ object." #f))) (_ #f))) +(define (package-input package name) + "Return the package input NAME of PACKAGE--i.e., an input +from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not +considered. If this input does not exist, return #f instead." + (and=> (or (assoc-ref (package-inputs package) name) + (assoc-ref (package-propagated-inputs package) name)) + car)) + +(define (package-native-input package name) + "Return the native package input NAME of PACKAGE--i.e., an input +from the ‘native-inputs’ field. If this native input does not exist, +return #f instead." + (and=> (assoc-ref (package-native-inputs package) name) + car)) + +(define-syntax-rule (this-package-input name) + "Return the input NAME of the package being defined--i.e., an input +from the ‘inputs’ or ‘propagated-inputs’ field. Native inputs are not +considered. If this input does not exist, return #f instead." + (package-input this-package name)) + +(define-syntax-rule (this-package-native-input name) + "Return the native package input NAME of the package being defined--i.e., +an input from the ‘native-inputs’ field. If this native input does not +exist, return #f instead." + (package-native-input this-package name)) ;; Error conditions. diff --git a/tests/packages.scm b/tests/packages.scm index 47d10af5bc..91ec38e4cc 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1851,6 +1852,39 @@ (package-location (specification->package "guile@2")) (specification->location "guile@2")) +(test-eq "this-package-input, exists" + hello + (package-arguments + (dummy-package "a" + (inputs `(("hello" ,hello))) + (arguments (this-package-input "hello"))))) + +(test-eq "this-package-input, exists in propagated-inputs" + hello + (package-arguments + (dummy-package "a" + (propagated-inputs `(("hello" ,hello))) + (arguments (this-package-input "hello"))))) + +(test-eq "this-package-input, does not exist" + #f + (package-arguments + (dummy-package "a" + (arguments (this-package-input "hello"))))) + +(test-eq "this-package-native-input, exists" + hello + (package-arguments + (dummy-package "a" + (native-inputs `(("hello" ,hello))) + (arguments (this-package-native-input "hello"))))) + +(test-eq "this-package-native-input, does not exists" + #f + (package-arguments + (dummy-package "a" + (arguments (this-package-native-input "hello"))))) + (test-end "packages") ;;; Local Variables: From patchwork Mon Jun 14 15:38:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30248 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 4199427BC81; Mon, 14 Jun 2021 16:52:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0008227BC78 for ; Mon, 14 Jun 2021 16:52:18 +0100 (BST) Received: from localhost ([::1]:42888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsosr-0000sL-WC for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:52:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog2-0002vq-Sq for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog2-0007iu-Ip for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Ii-Gs for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 04/37] net-base: Make #:builder argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368510316393 (code B ref 49025); Mon, 14 Jun 2021 15:39:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:23 +0000 Received: from localhost ([127.0.0.1]:47575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofO-0004GF-QF for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:23 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofH-00049r-MG for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:16 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3eF250050mfAB4013eFYK; Mon, 14 Jun 2021 17:38:15 +0200 Message-ID: <1c6f166aa09333a575a5249fdb395cf1b59ad947.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:15 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685095; bh=F0LQlc52A3WRTY1kOYijXentyYV4rzyXJT81/RjV9wU=; h=Subject:From:To:Date:In-Reply-To:References; b=nfeFq8/nU01K99gdGFZKmFaHIfxQTU7E6T4z4Gmm99o8K0K8pAF4izb5zf+a1SuJH QuQIWnefCoRYKMC3jWfJjW1+tbyf2TCtLTCImMmH3CAdU5nAQTwbfsH7aNCZv2kgRy iseAlSH6nZllQgwaWDqfYmXzNATR53L86g3uYTD96DsQ6f3sbUKEACFTbDOzXQt1PQ eBltrYL00WqIxuHnQ1nAn2shkWoFNCmWjAM1AcuWz0JxifPyv0bEsRe3M2PxJCw3ep Fl5N/LXe/yx9AZ0xs1IoIOetx7SS7zwhK85zzdAqQfjjTx7ge15wRzJ+4ptW2D24mW NRKT2JV5+g7lA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using ungexp-native and this-package-native-input later. * gnu/packages/admin.scm (net-base)[arguments]{#:builder}: Make this a G-expression. --- gnu/packages/admin.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 531686fdbb..5c7e41f51b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -74,6 +74,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autogen) @@ -936,25 +937,25 @@ to allow automatic login and starting any app.") (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) - (etc (string-append output "/etc"))) - (setenv "PATH" (string-append xz "/bin")) - (invoke (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "netbase-" version)) - (mkdir-p etc) - (for-each copy-file - '("etc-services" "etc-protocols" "etc-rpc") - (map (cut string-append etc "/" <>) - '("services" "protocols" "rpc"))) - #t)))) + #:builder ,#~(begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (output (assoc-ref %outputs "out")) + (etc (string-append output "/etc"))) + (setenv "PATH" (string-append xz "/bin")) + (invoke (string-append tar "/bin/tar") "xvf" + source) + (chdir #$(string-append "netbase-" version)) + (mkdir-p etc) + (for-each copy-file + '("etc-services" "etc-protocols" "etc-rpc") + (map (cut string-append etc "/" <>) + '("services" "protocols" "rpc"))) + #t)))) (native-inputs `(("tar" ,tar) ("xz" ,xz))) (synopsis "IANA protocol, port, and RPC number assignments") From patchwork Mon Jun 14 15:38:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30241 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 DC4AE27BC81; Mon, 14 Jun 2021 16:47:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AA57027BC78 for ; Mon, 14 Jun 2021 16:47:28 +0100 (BST) Received: from localhost ([::1]:54876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsooB-0006rp-OD for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog3-0002xq-Bs for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog3-0007jH-26 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Ir-Uy for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368510316400 (code B ref 49025); Mon, 14 Jun 2021 15:39:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:23 +0000 Received: from localhost ([127.0.0.1]:47577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofP-0004GM-5L for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:23 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofL-0004Ah-PZ for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:20 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3eK2500B0mfAB4063eKFS; Mon, 14 Jun 2021 17:38:19 +0200 Message-ID: <1d2e246e4d21a5b3d7b4232478d51b04bbf9434e.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:19 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685099; bh=r4nFZNWcGI3MO/Oqsl7UNynuqHxLQ4x318YLbObD7zA=; h=Subject:From:To:Date:In-Reply-To:References; b=JLVeY3WOPqETBVBCNdWJmt+VJME2OKHemYWkL2zqpmUeib5sVjEwS5MiOSD6NoN9T l+YmO/cPkIWwjDzxgg3wgqFtXUD0sZi21Q6+9Yi8NPrLtGjMTI4CLADU0v/o3qHy6a F22hZ/bgiE3zYguNK171XCzmROrVNgjKVK+wdYRTSROHkKV+4e2gGFGaIYByh3e3zo 44FTuDz5mGtABKuEDjEPtB1lwYgLgtOcZLrzauAgNilFOLN9ZAuk50gJnh6q6DPW96 Rf3tG85VZh+DjvPawCqSMBCTN/FJ4rSHaYtoAeAoBoJbru0YDL+lFCBEpawsDkgFbJ D4RJvtMU+SSKQ== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches "source" is not in %build-inputs when cross-compiling, so another approach for referring to the package source code is needed. * gnu/packages/admin.scm (net-base)[arguments]<#:builder>: Eliminate %build-inputs and %outputs. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5c7e41f51b..f499a1252b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -941,10 +941,10 @@ to allow automatic login and starting any app.") (use-modules (guix build utils) (srfi srfi-26)) - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) + (let* ((source #+(package-source this-package)) + (tar #+(this-package-native-input "tar")) + (xz #+(this-package-native-input "xz")) + (output #$output) (etc (string-append output "/etc"))) (setenv "PATH" (string-append xz "/bin")) (invoke (string-append tar "/bin/tar") "xvf" From patchwork Mon Jun 14 15:38:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30242 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 989CF27BC81; Mon, 14 Jun 2021 16:47:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 56C3327BC78 for ; Mon, 14 Jun 2021 16:47:37 +0100 (BST) Received: from localhost ([::1]:55726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsooK-0007QP-C9 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog3-00030M-Uv for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog3-0007jg-MJ for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog3-0004JA-KI for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 06/37] net-base: Don't cross-compile. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368510516414 (code B ref 49025); Mon, 14 Jun 2021 15:39:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:25 +0000 Received: from localhost ([127.0.0.1]:47581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofR-0004Gf-Ex for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:25 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofP-00049r-RR for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:24 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3eP250040mfAB4013ePZK; Mon, 14 Jun 2021 17:38:23 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:23 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685103; bh=D6h4efNC/N0zpFdlOyJY4D28DmCroi3j7Er55HedB14=; h=Subject:From:To:Date:In-Reply-To:References; b=VqOQnmtzUdWlXTTwCrlHVFWuXWoKOryq1fWYwrDvWDTk6q6cO255tnx7lHRifE5+r vVQKsD0QyQ0sZ1T3I/4CgTkA30FXtnBBpvEmBXNp2gJVuVBvi246IL7SrxWKLOLdnw OHbhROOfO0Z9LMctv1bauSfGC9FphIYw8lgHNOU//rURnX3eGfM0OIlFBewBBCmiYv o3whY7x9Fqul8lTovcFa4VUAyzd4G4FWrZCwO07mboiF/bYQGBQF04YOkxPkeFomws /iWT0lX/AQiyR8iUAVSUOya3ggizLhTg9xM7gseNJMHF/wNsj9di5RGSJ682BIYo0A Gbp2J0VyXDu4A== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches net-base is pure data, so cross-compiling is pointless. * gnu/packages/admin.scm (net-base)[arguments]<#:target>: Set to #f. (net-base)[arguments]<#:allowed-references>: Disallow all references. --- gnu/packages/admin.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f499a1252b..5e41ba9967 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -937,6 +937,11 @@ to allow automatic login and starting any app.") (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) + ;; This package consists solely of architecture-independent + ;; tables. Cross-compilation is pointless! Make sure we'll + ;; always get the same derivation. + #:target #f + #:allowed-references () #:builder ,#~(begin (use-modules (guix build utils) (srfi srfi-26)) From patchwork Mon Jun 14 15:39:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30244 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 9794927BC81; Mon, 14 Jun 2021 16:47:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2604727BC78 for ; Mon, 14 Jun 2021 16:47:57 +0100 (BST) Received: from localhost ([::1]:57390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsood-0008WK-TT for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog6-0003AQ-8r for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog6-0007lX-0c for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog5-0004Jy-VF for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 07/37] tzdata: Don't bother with cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368514316559 (code B ref 49025); Mon, 14 Jun 2021 15:39:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:03 +0000 Received: from localhost ([127.0.0.1]:47614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Iq-TA for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog0-0004Ah-O0 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3f02500A0mfAB4063f0PC; Mon, 14 Jun 2021 17:39:00 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:00 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685140; bh=MlMuHMqYDzhc6XFq5e0TxsPJU9BAD9W8k4lWlfe8A48=; h=Subject:From:To:Date:In-Reply-To:References; b=KjI9MyRuMv7cSsiIR8WKuFPzOlydhPy0pX6ARFXrEGBLpYIYzyURSgtZssrMNlBWF UTerOK+f8eT0HyTjnRWxKIOr0k3Wtb/3vuOL/nZFCgsnp5hBWbL1sVr6wHgXp4f5Rk I5td4NeUNxwgZAP0+ecN7TbTRIzj1A3qEwHd5QA0Rn6e4rQZFjM+fdD5EY3fFv36qV ICA2o+t9mZfWavQcBwzqUS61P+wuzBHnDSBYhswrxCQLtWGYSgE5rTC2Bzc7pEQhEu WpjiVHTqDB2xnmybb03sT/M9BY94aH0Zti53olawVKDLNzIbYHE4x2PRzHa9fLDOHU twWgBA+oNY6Tw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The time zone database is architecture-independent, so trying to cross-compile it is pointless! * gnu/packages/base.scm (tzdata)[arguments]<#:target>: Set to #f. (tzdata)[allowed-references]: Only include the "out" output itself, to make sure no (architecture-dependent) binaries are installed. --- gnu/packages/base.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d30299a7b6..2674be8048 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Vitaliy Shatrov ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2021 Leo Le Bouter +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1251,6 +1252,14 @@ command.") (build-system gnu-build-system) (arguments `(#:tests? #f + ;; This consists purely of (architecture-independent) data, + ;; so ‘cross-compilation’ is pointless here! + ;; (The binaries zic, dump, and tzselect are deleted in the post-install + ;; phase.) + #:target #f + ;; share/zoneinfo/posix is a symlink to share/zoneinfo, + ;; so include the package itself in #:allowed-references. + #:allowed-references ("out") #:make-flags (let ((out (assoc-ref %outputs "out")) (tmp (getenv "TMPDIR"))) (list (string-append "TOPDIR=" out) From patchwork Mon Jun 14 15:37:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30260 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 9EE6A27BC81; Mon, 14 Jun 2021 17:00:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 707C327BC78 for ; Mon, 14 Jun 2021 17:00:03 +0100 (BST) Received: from localhost ([::1]:36932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp0M-0008GC-F1 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:00:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof4-0008GD-90 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof4-00076p-07 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof3-0004DS-U1 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 08/37] libgpg-error: Remove trailing #f from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368502816000 (code B ref 49025); Mon, 14 Jun 2021 15:38:01 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:08 +0000 Received: from localhost ([127.0.0.1]:47495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeC-00049z-Hg for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:08 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeA-00049r-Q7 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:07 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3d42500f0mfAB4013d5M6; Mon, 14 Jun 2021 17:37:05 +0200 Message-ID: <719b5bd1487e883362f08afaec6facd58dec1f81.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:04 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685025; bh=2mNuqtGeAfIWD7O6+ZcW4PfyUsI/Hgiw0epAcaPxFOw=; h=Subject:From:To:Date:In-Reply-To:References; b=rMDN+/RbGPMilY53Ke7GprIdu8Fc/qpBuPP5FU/8Nn6fuc+e7hwamNRpQRfWFUlam TZIxILpVSGOFEupglAx4iZuLqA3fD0pX+zpbN75VV3deCW/QFzxvtX2cxfz0Kw2GD4 atfoz5z55OT1iiAwjIY5euZjydDs2+gW44Te86djMTGZNqiQg+kfXs+Z/xNZTchas+ JVLpQTiZYEx4PD9cBFmoglPMZocKJbwdpJtYw+sJrreYU/n65ZZvczDDAUhyANIsp7 stAIr2LD3AucBYkOzr6MXN0VrGidl3W6yrb4kSLZzv6sNjJ0FyJscynIVTN7aNPZyn +cyH2kJmGLclQ== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches These aren't required anymore. * gnu/packages/gnupg.scm (libgpgerror)[arguments]{cross-symlinks}: Remove trailing #f. --- gnu/packages/gnupg.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index cb481b38e1..2f44e6ec6a 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -114,8 +114,7 @@ (string-append x "-unknown-linux-gnu"))))) (symlink (string-append "lock-obj-pub." triplet ".h") - "src/syscfg/lock-obj-pub.linux-gnu.h")) - #t)))) + "src/syscfg/lock-obj-pub.linux-gnu.h")))))) '())) (native-inputs `(("gettext" ,gettext-minimal))) (home-page "https://gnupg.org") From patchwork Mon Jun 14 15:37:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30261 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 EA0B527BC81; Mon, 14 Jun 2021 17:01:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6265327BC78 for ; Mon, 14 Jun 2021 17:01:07 +0100 (BST) Received: from localhost ([::1]:37396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp1N-00008K-1E for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:01:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof4-0008I1-Lb for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof4-00076w-CQ for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof4-0004Db-Aa for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 09/37] libgpg-error: Prevent silent miscompilation some systems. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368503516017 (code B ref 49025); Mon, 14 Jun 2021 15:38:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:15 +0000 Received: from localhost ([127.0.0.1]:47499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeI-0004AH-OO for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:15 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeG-00049r-VG for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:14 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3dC2500C0mfAB4013dCMt; Mon, 14 Jun 2021 17:37:12 +0200 Message-ID: <48d3a94eacade6a6c34f9258f084fd2ac3ee4d8e.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:12 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685032; bh=6vTiQPb5qis4UWl8wp9f8t/yYv0pHVlVbDOMqZ61kL8=; h=Subject:From:To:Date:In-Reply-To:References; b=c4WZhlzh9eyplTKekG6c89uFkd243RsEGMk0WsoAlQb92eWokXY2Xx9LvvqQQWBvB pj7h/Lwqn+wFT0xoXih88kZqNXMEshJrLY5v5b0jDIELhpPEt4anWv2vFOA9jA81HE f8mc7cfuh68hYFPKNSc4/0bJpH67vPCFZjBZVu5BPi8+Qj99D0OuhHAaVvzhY4aFAU CPOvjgG0ib/Q24lHRH9eWOL8/pQOSy09jOrDenT+e4WlmJNSIOFmdab5pBYFtiuCck olS+L7Cw5FXlxfJNIwsWvHHy1xnAxQ/tfO9dmH5pNsMoknxAdxCW+k2fUuHMW6Za6M by7oX/dbTFDeQ== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gpg.scm (libgpgerror)[arguments]<#:phases>{cross-symlinks}: Only link to src/syscfg/lock-obj-pub.linux-gnu.h if the package is being compiled for a Linux target. Do not link either if the architecture is unknown, as the headers vary with the architecture. --- gnu/packages/gnupg.scm | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2f44e6ec6a..de213d381f 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Fredrik Salomonsson +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public libgpg-error @@ -94,27 +96,37 @@ (build-system gnu-build-system) (arguments (if (%current-target-system) - `(#:modules ((ice-9 match) - (guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils)) #:phases (modify-phases %standard-phases ;; When cross-compiling, some platform specific properties cannot ;; be detected. Create a symlink to the appropriate platform - ;; file. See Cross-Compiling section at: + ;; file if required. Note that these platform files depend on + ;; both the operating system and architecture! + ;; + ;; See Cross-Compiling section at: ;; https://github.com/gpg/libgpg-error/blob/master/README (add-after 'unpack 'cross-symlinks - (lambda* (#:key target inputs #:allow-other-keys) - (let ((triplet - (match (string-take target - (string-index target #\-)) - ("armhf" "arm-unknown-linux-gnueabi") - ("mips64el" "mips-unknown-linux-gnu") - (x - (string-append x "-unknown-linux-gnu"))))) - (symlink - (string-append "lock-obj-pub." triplet ".h") - "src/syscfg/lock-obj-pub.linux-gnu.h")))))) + (lambda _ + (define (link triplet source) + (symlink (string-append "lock-obj-pub." triplet ".h") + (string-append "src/syscfg/lock-obj-pub." + source ".h"))) + ,(let* ((target (%current-target-system)) + (architecture + (string-take target (string-index target #\-)))) + (cond ((target-linux? target) + (match architecture + ("armhf" + `(link "arm-unknown-linux-gnueabi" "linux-gnu")) + ("mips64el" + `(link "mips-unknown-linux-gnu" "linux-gnu")) + ;; Don't always link to the "linux-gnu" + ;; configuration, as this is not correct for + ;; all architectures. + (_ #t))) + (#t #t))))))) '())) (native-inputs `(("gettext" ,gettext-minimal))) (home-page "https://gnupg.org") From patchwork Mon Jun 14 15:37:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30236 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 07C8A27BC81; Mon, 14 Jun 2021 16:45:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A28BB27BC78 for ; Mon, 14 Jun 2021 16:45:58 +0100 (BST) Received: from localhost ([::1]:50662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsomj-0003wo-OL for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:45:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof7-0008R5-2s for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof6-00079B-Qq for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof6-0004EP-P6 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 10/37] libgpgerror: Maybe fix a cross-compilation bug. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368506216121 (code B ref 49025); Mon, 14 Jun 2021 15:38:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:42 +0000 Received: from localhost ([127.0.0.1]:47523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoej-0004Bx-Ry for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:42 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoej-0004AR-1g for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:41 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3dg2500M0mfAB4063dgu4; Mon, 14 Jun 2021 17:37:40 +0200 Message-ID: <948fec07fa2cea1e1860da413757ea8755c16a89.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:40 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685060; bh=z9K2MAy6IWZv0IqH2jaAHv6vH2p9yOpDS7BaqtlOtDo=; h=Subject:From:To:Date:In-Reply-To:References; b=bZeVcCSwvXdLIJex/lCmpnMCwoDohEBqxwNScvtiG3vORKOfMUQMN830GxJbmivWo Gu5yXCqLPDHktRFeSL7+Lzaz4DYJe/XgLLCDhZtNzdxqjF+/PR1fLe47+LgedTqG6f IHk0KqhNcF6sJ20ddSJnUnGvW+anhV01gEKeSgHmLlpQV88fcs0n5HLsUCuDbXBOMu SCSSalfNgQs8RXG8J76KmLFnC/JK9divRahsGHU3jk9VISQjSJ7HcWwJ3X2NsekqWw YF0KzPJMln/EM4IUBX2YSJ00Fj7vtf864HtICCqxQ65hsTBnBP0yvN/Q0hsCd4WCQ7 b1cWKfLrs8pUQ== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Previously, a symlink was created at src/syscfg/lock-obj-pub.linux-gnu.h pointing at lock-obj-pub.MANGLED-TARGET.h. I would think this has to be the other way around, but I am not really sure. * gnu/packages/gnupg.scm (gnupg)[arguments]<#:phases>{cross-symlinks}(link): Switch 'triplet' and 'source'. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index de213d381f..f5d4118af9 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -110,9 +110,9 @@ (add-after 'unpack 'cross-symlinks (lambda _ (define (link triplet source) - (symlink (string-append "lock-obj-pub." triplet ".h") + (symlink (string-append "lock-obj-pub." source ".h") (string-append "src/syscfg/lock-obj-pub." - source ".h"))) + triplet ".h"))) ,(let* ((target (%current-target-system)) (architecture (string-take target (string-index target #\-)))) From patchwork Mon Jun 14 15:37:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30254 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 7B3B027BC81; Mon, 14 Jun 2021 16:57:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3AAFC27BC78 for ; Mon, 14 Jun 2021 16:57:22 +0100 (BST) Received: from localhost ([::1]:56432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoxk-0001zq-RT for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:57:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof7-0008So-HO for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof7-00079d-84 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof7-0004EW-61 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 11/37] libgpg-error: Fix cross-compilation error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368506716138 (code B ref 49025); Mon, 14 Jun 2021 15:38:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:47 +0000 Received: from localhost ([127.0.0.1]:47527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoep-0004CE-39 for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:47 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoen-00049r-N0 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:46 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3dl250040mfAB4013dlRn; Mon, 14 Jun 2021 17:37:45 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:45 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685065; bh=xCISRmw/NcIj16CSXxBmMUhAtPL418p40XYo8HWSSlA=; h=Subject:From:To:Date:In-Reply-To:References; b=fcXc55pyk7GZCkvmVFMSLEKdaAHYOnyaL8RuaQ8ud/2niUE14M+h27Y/Jg68Ew8kM eAzENkmFFt9bIM1virCxpH7/sFP69/0F6qhKp/lVZIoA+aO2gIr//ahtO7qD0Pi2kB pR6f12HENfSF2bVP7ok/Kwq8fFugovTTgt2Rly3QEjy5AoemIw9slro8KIVzEQFm4g 1t2P8n39i8eDBACgLlnS1iEM0Paw0lgp3Uwmt7G5YJ/1A5MWC7c7Wjnw05WHgQEa++ wajgDFRqOutAFqKpQBdqmBybUm38jlXk2KTzLbmGUbHewu2pEaB5/YJNGQYfuEC1Rf Eql+8e7oQ5P1g== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches TODO: inform upstream about the cross-compilation error. * gnu/packages/gnupg.scm (libgpg-error)[arguments]{fix-gen-lock-obj.sh}: Prevent generated header files from being sprinkled with ‘\c’. --- gnu/packages/gnupg.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f5d4118af9..1fee30584c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -100,6 +100,13 @@ (guix build utils)) #:phases (modify-phases %standard-phases + ;; If this is left out, some generated header + ;; files will be sprinkled with ‘\c’, which + ;; the compiler won't like. + (add-after 'unpack 'fix-gen-lock-obj.sh + (lambda _ + (substitute* "src/gen-lock-obj.sh" + (("if test -n `echo -n`") "if ! test -n `echo -n`")))) ;; When cross-compiling, some platform specific properties cannot ;; be detected. Create a symlink to the appropriate platform ;; file if required. Note that these platform files depend on From patchwork Mon Jun 14 15:37:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30253 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 5448727BC81; Mon, 14 Jun 2021 16:57:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 168D927BC78 for ; Mon, 14 Jun 2021 16:57:09 +0100 (BST) Received: from localhost ([::1]:55806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoxY-0001Yz-4i for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof6-0008Q5-OZ for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof6-00078n-EL for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof6-0004EH-Ch for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 12/37] libgcrypt: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368505816105 (code B ref 49025); Mon, 14 Jun 2021 15:38:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:38 +0000 Received: from localhost ([127.0.0.1]:47519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoef-0004Bg-KH for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:37 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoed-00049r-8H for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:35 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3da2500K0mfAB4013daQW; Mon, 14 Jun 2021 17:37:34 +0200 Message-ID: <97624d382b54763e0753a1e9526be77c521907c4.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:34 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685054; bh=nv31MQlIII2/PGkn8qfb8Jqa7C1agUnjicNAqERTAM0=; h=Subject:From:To:Date:In-Reply-To:References; b=ZepTO7DxgtDn44xt0tJ4J/V5E1s50U/law24EbFUsI0qwLdrCv9wkvQXbGnTjM30i TB0fSLNNlqD5umnMpbQimuCDw7MTzEQxlUJElBCSO/CRFLvaIEwW/52szQWBS1k2Ky n4IIhiEjfMf6txVEt/Owua5T8H9FYMcIuY12g+amEFEg/wnCpU42pj9xlTJyBNRbJU 010EHinJFSbk80XzaxMaYSrG0vA8tesX2E69EmrWFTmsPHCbZ71198/8grZBRlSrzx uZDcyg9wMxZOo8QnO1eqD3NZMOJMT58uS/vidjvRraEKZpymEvomXuvbrdvY3GOQie SgpDJZG47JVcg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches When cross-compiling a package using gnu-build-system, %build-inputs does not exist. But libgcrypt uses %build-inputs anyway. Fix it. * gnu/packages/gnupg.scm (libgcrypt)[arguments]<#:configure-flags>: Make this a G-exp instead of a raw S-exp. Eliminate %build-inputs and use this-package-input instead. --- gnu/packages/gnupg.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 1fee30584c..35cfdf6f43 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -74,6 +74,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) @@ -169,11 +170,12 @@ Daemon and possibly more in the future.") ;; 'configure' uses 'gpg-error-config' to determine the '-L' flag, and ;; the 'gpg-error-config' it runs is the native one---i.e., the wrong one. `(#:configure-flags - (list (string-append "--with-gpg-error-prefix=" - (assoc-ref %build-inputs "libgpg-error-host")) - ;; When cross-compiling, _gcry_mpih_lshift etc are undefined - ,@(if (%current-target-system) '("--disable-asm") - '())))) + ,#~(list (string-append "--with-gpg-error-prefix=" + #$(this-package-input "libgpg-error-host")) + ;; When cross-compiling, _gcry_mpih_lshift etc are undefined + #$@(if (%current-target-system) + #~("--disable-asm") + #~())))) (outputs '("out" "debug")) (home-page "https://gnupg.org/") (synopsis "Cryptographic function library") From patchwork Mon Jun 14 15:37:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30264 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 4E79127BC81; Mon, 14 Jun 2021 17:01:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 13A9027BC78 for ; Mon, 14 Jun 2021 17:01:55 +0100 (BST) Received: from localhost ([::1]:40138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp29-00026C-RF for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:01:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof5-0008My-S0 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof5-00077z-Im for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof5-0004Dx-HE for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368504816070 (code B ref 49025); Mon, 14 Jun 2021 15:38:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:28 +0000 Received: from localhost ([127.0.0.1]:47511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeV-0004B8-Th for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:28 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeU-00049r-9V for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:26 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3dR2500S0mfAB4013dRPV; Mon, 14 Jun 2021 17:37:25 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:25 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685046; bh=1qeLHwmVYIRx4Ue2kBqdwmyXBFtamfF8FXSEaCaqb2w=; h=Subject:From:To:Date:In-Reply-To:References; b=qhTcRSpGiVMJEzEBmTLqH7oG9Lprx+toSPJrAUWcTNoz4pwlGUupEpsYa1e8GzUQd NUHCtaSNzDZWZp5GWh2Ik2Mmbe5hxVchp4tPdsVFgLZFzA/tCo+EzVvpB2nztWLKSt /n+v+6s5x/XOtVySbgr2Pzsh4QGO/l1u1PBuMgjCcqNVNuFThMe82OF6K43DdIugBb eYiDmOoTMHKFROMjvoGQS6mBSy2FYHZHX3+wScgdfcGYs+u4YZUc5VhgGLzJyzrddh hJGWFhoG4f5X34G5NIJSXZwvXCWzcJ1TrQMZq1HHi5im9KzPLbeTVmOOYTi6fA+aKB VpRA+/3clVJDQ== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using ungexp later. * gnu/packages/python.scm (wrap-python3)<#:builder>: Make this a G-expression. --- gnu/packages/python.scm | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b2ec486d7a..9628836567 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -573,29 +573,29 @@ for more information."))) (arguments `(#:modules ((guix build utils)) #:builder - (begin - (use-modules (guix build utils)) - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) - (mkdir-p bin) - (for-each - (lambda (old new) - (symlink (string-append python old) - (string-append bin "/" new))) - `("python3" ,"pydoc3" ,"idle3" ,"pip3") - `("python" ,"pydoc" ,"idle" ,"pip")) - ;; python-config outputs search paths based upon its location, - ;; use a bash wrapper to avoid changing its outputs. - (let ((bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) - (old (string-append python "python3-config")) - (new (string-append bin "/python-config"))) - (with-output-to-file new - (lambda () - (format #t "#!~a~%" bash) - (format #t "exec \"~a\" \"$@\"~%" old) - (chmod new #o755) - #t))))))) + ,#~(begin + (use-modules (guix build utils)) + (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) + (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) + (mkdir-p bin) + (for-each + (lambda (old new) + (symlink (string-append python old) + (string-append bin "/" new))) + `("python3" ,"pydoc3" ,"idle3" ,"pip3") + `("python" ,"pydoc" ,"idle" ,"pip")) + ;; python-config outputs search paths based upon its location, + ;; use a bash wrapper to avoid changing its outputs. + (let ((bash (string-append (assoc-ref %build-inputs "bash") + "/bin/bash")) + (old (string-append python "python3-config")) + (new (string-append bin "/python-config"))) + (with-output-to-file new + (lambda () + (format #t "#!~a~%" bash) + (format #t "exec \"~a\" \"$@\"~%" old) + (chmod new #o755) + #t))))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such From patchwork Mon Jun 14 15:37:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30246 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 888FD27BC81; Mon, 14 Jun 2021 16:51:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4917D27BC78 for ; Mon, 14 Jun 2021 16:51:36 +0100 (BST) Received: from localhost ([::1]:41582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsosB-0008Pp-C7 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:51:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof6-0008OR-9i for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof6-00078d-0b for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof5-0004E4-VB for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 14/37] wrap-python3: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368505216088 (code B ref 49025); Mon, 14 Jun 2021 15:38:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:32 +0000 Received: from localhost ([127.0.0.1]:47515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoea-0004BQ-6A for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoeY-00049r-On for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:31 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3dW250060mfAB4013dWQ2; Mon, 14 Jun 2021 17:37:30 +0200 Message-ID: <52ef98617777bb5553dbaa830f39def091999684.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:30 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685050; bh=vOVficC9U8uPwTBfojzKpbaV8Yuj5zuhKsr10MgGED8=; h=Subject:From:To:Date:In-Reply-To:References; b=grdUY+5ihICF2brGIg2gFCNfSsE3b9FeWgLqSLObIeq+UXfgBftJLG5ZklbXmdhp1 puocVJ5wAEeaOJsrq8lJgYxxCKgr0C9GR7pk26T/Qb+Q3rJBnpUg10hDLvZGC7OLHL 2aT5y09F4JjuFsn3MPMzWJV714OMADoSDnwAaLS9cEC6wSfohTlYOq627RDu2g2jzb OprEW4PJf6vmVCRMKzYL/EvQH1yWEtBsZjdJMDgnjqpTbTy+bEgjV7k7mXQOrpTVRZ 9yhpiWQ5gACh5WgkJKcieCrVbqo0Qei01nqcrtPI0g89CP/LkYPVllqg15AaKG2dDW sZ34UyhiZslKw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches When cross-compiling, "bash" is missing from %build-inputs, leading to a build error. Use this-package-input instead of %build-inputs to resolve this. While we're at it, eliminate all uses of %outputs and %build-inputs. * gnu/packages/python.scm (wrap-python3)[arguments]<#:builder>: Eliminte %outputs and %build-inputs. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9628836567..fbad0b65b8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Greg Hogan +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -575,8 +576,8 @@ for more information."))) #:builder ,#~(begin (use-modules (guix build utils)) - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) + (let ((bin (string-append #$output "/bin")) + (python #$(file-append (this-package-input "python") "/bin/"))) (mkdir-p bin) (for-each (lambda (old new) @@ -586,8 +587,7 @@ for more information."))) `("python" ,"pydoc" ,"idle" ,"pip")) ;; python-config outputs search paths based upon its location, ;; use a bash wrapper to avoid changing its outputs. - (let ((bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) + (let ((bash #$(file-append (this-package-input "bash") "/bin/bash")) (old (string-append python "python3-config")) (new (string-append bin "/python-config"))) (with-output-to-file new From patchwork Mon Jun 14 15:38:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30268 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 C6D7A27BC81; Mon, 14 Jun 2021 17:07:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7A93827BC78 for ; Mon, 14 Jun 2021 17:07:45 +0100 (BST) Received: from localhost ([::1]:51902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp7o-0001o5-IZ for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:07:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp79-0001lM-8I for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp78-0008MF-Vy for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp78-00054r-PL for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 15/37] python: Fix reference to input when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368679319443 (code B ref 49025); Mon, 14 Jun 2021 16:07:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:33 +0000 Received: from localhost ([127.0.0.1]:47693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6e-00053R-CA for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoft-00049r-9U for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:53 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3es2500L0mfAB4013esdw; Mon, 14 Jun 2021 17:38:52 +0200 Message-ID: <6248f1f47c912ca357fd1c5f390c9007033dade1.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:52 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685133; bh=sxYEjfJFxqzIqdewtxXhkwGSS1U07GxaI+f6QcrtDkQ=; h=Subject:From:To:Date:In-Reply-To:References; b=d6TcwFiICsA1vLcmeKtl8EmmTLcTJmY1KPUk26kovO0ur5pe2UtyU1K1+4wuzHFnw fLDyo3zTOELYGMorz3DmKc7E0Mc7TPcSpRgOkV4z3suUipoiA5gJaDX/YZwi8LxCXT NgKofb3Tp4HBYDOQh1L5q+9zPMLsFyi3zpt2JJNJ+jlTIn57Lt4SNJNatt1oRmxwn9 0rMWqiOSebDE107H8YiqqP6DOj0Rlszx6EPNCrWwQK1zSsN4XUcni3ZFV0kGL7jYiG HsSNMRb5vntekeqjuUykeZPmZJIcF7NYKqGVJuEk4atjPZADzkAbvgla4996++LiV+ 69vR2z2AuX87w== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches "sitecustomize.py" is a native input, so look it up in 'native-inputs', not 'inputs'. * gnu/packages/python.scm (customize-site): Look up "sizecustomize.py" in 'native-inputs', not 'inputs'. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbad0b65b8..f004b8e739 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -111,13 +111,14 @@ (define* (customize-site version) "Generate a install-sitecustomize.py phase, using VERSION." - `(lambda* (#:key inputs outputs #:allow-other-keys) + `(lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (site-packages (string-append out "/lib/python" ,(version-major+minor version) "/site-packages")) - (sitecustomize.py (assoc-ref inputs "sitecustomize.py")) + (sitecustomize.py (assoc-ref (or native-inputs inputs) + "sitecustomize.py")) (dest (string-append site-packages "/sitecustomize.py"))) (mkdir-p site-packages) (copy-file sitecustomize.py dest) From patchwork Mon Jun 14 15:37:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30237 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 3C8A727BC81; Mon, 14 Jun 2021 16:46:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04AEC27BC78 for ; Mon, 14 Jun 2021 16:46:16 +0100 (BST) Received: from localhost ([::1]:51554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lson1-0004d5-1T for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:46:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof7-0008Uf-UO for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36010) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof7-0007A0-Lh for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof7-0004Ee-JT for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 16/37] openssl: Remove trailing #t from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368507016153 (code B ref 49025); Mon, 14 Jun 2021 15:38:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:50 +0000 Received: from localhost ([127.0.0.1]:47531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoes-0004CT-Ct for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:50 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoer-00049r-1o for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:49 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3do2500P0mfAB4013doSL; Mon, 14 Jun 2021 17:37:48 +0200 Message-ID: <087c14ca9722ecea88b38f7d023c8e8997a8bf09.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:48 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685068; bh=B7MwnXvSxDVdE3dfX7pzPjcManizK182q4YsL6oTrkI=; h=Subject:From:To:Date:In-Reply-To:References; b=g0FK+eweD6DezoyMJ5VwJf2xlZJVmwVUksyuXPszC+GKlY+8NgYOB2YL0Nr5Ia8fq /AlbF60sgjBTkq6VZ7ZY4R/37PH4b3N5/DjzPk1Adlbk4wnBtD27cOx05FqdpScKlh WXISXA5S9k20A4M2tZfdS/bbQJhq41pGijeqSuDKKFTFvnYif/OmHNOrEJnQqtw/Ot bu7S7x0axSH4XMcfRvJZ5J6JECfMRkQemp9rkZJYStdyzXcbFIp7C6a0tBOeZmMTZw a48y7pxEMtJLUjz9ovaNvmMUglOW4R7xgvsR+EuwuBU7UxfFnYxbU3D588ZhI/IEUR Y2xFbWA5XE2BA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Delete trailing #t. --- gnu/packages/tls.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 608a7d05b8..5bfc5545db 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -366,8 +366,7 @@ required structures.") ((string-prefix? "powerpc64" target) "linux-ppc64") ((string-prefix? "powerpc" target) - "linux-ppc"))) - #t))) + "linux-ppc")))))) '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -406,8 +405,7 @@ required structures.") (for-each (lambda (file) (install-file file slib) (delete-file file)) - (find-files lib "\\.a$")) - #t))) + (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation (lambda* (#:key outputs #:allow-other-keys) ;; Move man3 pages and full HTML documentation to "doc". @@ -420,8 +418,7 @@ required structures.") (copy-recursively man3 man-target) (delete-file-recursively man3) (copy-recursively html html-target) - (delete-file-recursively html) - #t))) + (delete-file-recursively html)))) (add-after 'install 'remove-miscellany (lambda* (#:key outputs #:allow-other-keys) @@ -430,8 +427,7 @@ required structures.") (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" ,(package-version this-package) - "/misc")) - #t)))))) + "/misc")))))))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR") From patchwork Mon Jun 14 15:37:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30238 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 D63CC27BC81; Mon, 14 Jun 2021 16:46:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5F4FB27BC78 for ; Mon, 14 Jun 2021 16:46:34 +0100 (BST) Received: from localhost ([::1]:52424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsonH-0005DB-RA for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:46:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof8-000055-C7 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof8-0007AO-3p for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof8-0004Es-1R for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 17/37] openssl: Make the #:phases argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368507516170 (code B ref 49025); Mon, 14 Jun 2021 15:38:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:55 +0000 Received: from localhost ([127.0.0.1]:47535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoew-0004Ck-LA for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:54 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoev-0004Ah-Ax for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:53 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3ds2500i0mfAB4063dsBN; Mon, 14 Jun 2021 17:37:53 +0200 Message-ID: <6ef2004dd9701ac6e886ba121b3fe0a113741aa3.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:52 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685073; bh=kTSjcdjvjf+9HkDG4i3zlg/A9UJgJ7JJ4bB5EfYFO6k=; h=Subject:From:To:Date:In-Reply-To:References; b=EfnSj3WDTM+YnK+5xCbNzNT18CmFY+tcBPaBik3KR2AkXU6gAMkFZPY6qyl6DZ5I7 IYGS1HWWT0YBgCOf/1SqoHQJ+uDnj3/JOe5rBA/l28gZfAkeot1mepv+j8rPYCuzq1 ey7v15MiyHSDJ150uYEpYHVyZuhIWhPCdanMq0tQIElANi2KmxbjKs5ZPxS4a65BOF JcQHESl+fGK0VrXOV7I9C9FD0Ca1AZABxvHgkoNK8oDlBZGoYyIZWieP/QrwgeEbWV 8I6SPP3wekDbL7k2lW6Q7RAdrBLiBEAtp1lHN+Kfss9WckiVT9ZfM+AtIW4DVgxlcG iXxByk4FPucWA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using this-package-native-input later. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Make this a G-expression. (openssl-1.0)[arguments]<#:phases>: Likewise. --- gnu/packages/tls.scm | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5bfc5545db..9de9a78e84 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -38,6 +38,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -341,9 +342,10 @@ required structures.") ;; so we explicitly disallow it here. #:disallowed-references ,(list (canonical-package perl)) #:phases + ,#~ (modify-phases %standard-phases - ,@(if (%current-target-system) - '((add-before + #$@(if (%current-target-system) + #~((add-before 'configure 'set-cross-compile (lambda* (#:key target outputs #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) @@ -367,7 +369,7 @@ required structures.") "linux-ppc64") ((string-prefix? "powerpc" target) "linux-ppc")))))) - '()) + #~()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -377,9 +379,9 @@ required structures.") (("/usr/bin/env") (string-append (assoc-ref %build-inputs "coreutils") "/bin/env"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + (invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -388,13 +390,13 @@ required structures.") ;; conventional. (string-append "--openssldir=" out "/share/openssl-" - ,(package-version this-package)) + #$(package-version this-package)) (string-append "--prefix=" out) (string-append "-Wl,-rpath," lib) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + #$@(if (%current-target-system) + #~((getenv "CONFIGURE_TARGET_ARCH")) + #~()))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -426,7 +428,7 @@ required structures.") ;; scripts. Remove them to avoid retaining a reference on Perl. (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" - ,(package-version this-package) + #$(package-version this-package) "/misc")))))))) (native-search-paths (list (search-path-specification @@ -471,7 +473,7 @@ required structures.") ;; Parallel build is not supported in 1.0.x. ((#:parallel-build? _ #f) #f) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-before 'patch-source-shebangs 'patch-tests (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) @@ -494,9 +496,9 @@ required structures.") ;; Override this phase because OpenSSL 1.0 does not understand -rpath. (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + (invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -504,12 +506,12 @@ required structures.") ;; PREFIX/ssl. Change that to something more ;; conventional. (string-append "--openssldir=" out - "/share/openssl-" ,version) + "/share/openssl-" #$version) (string-append "--prefix=" out) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + #$@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (delete 'move-extra-documentation) (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys) @@ -534,7 +536,7 @@ required structures.") ;; scripts. Remove them to avoid retaining a reference on Perl. (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) + #$version "/misc")) #t))))))))) (define-public libressl From patchwork Mon Jun 14 15:37:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30239 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 A983227BC81; Mon, 14 Jun 2021 16:46:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 31FAD27BC78 for ; Mon, 14 Jun 2021 16:46:53 +0100 (BST) Received: from localhost ([::1]:53302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsonc-0005nK-AK for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:46:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof8-00007e-Pd for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof8-0007AT-GU for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof8-0004Ez-E9 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 18/37] openssl: Use G-exp machinery for referring to outputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368507916186 (code B ref 49025); Mon, 14 Jun 2021 15:38:06 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:59 +0000 Received: from localhost ([127.0.0.1]:47539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof1-0004D0-0h for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:59 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoez-0004AR-1i for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:57 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3dw2500A0mfAB4063dwx5; Mon, 14 Jun 2021 17:37:56 +0200 Message-ID: <9f50356b729d98eb09b66c55caa95791b1fe3209.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:56 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685076; bh=KLlMYyFZOSGpAA6P7XtX2q2k7QZAvy1ChdIPsS6tTa4=; h=Subject:From:To:Date:In-Reply-To:References; b=GPgH0CCc6v8RTapun7o/Wesv27Z+5cbQ6x+cfAqTOXHAZNvx+pfFoH33ienpB6Jvw 6dlIRHMSGoAhHab0fiVSVZyzKHZJ1QiNgNCM5WhF9PDCyOkQhexPzM+DOAiBJfIITS powMdPdFIASJCSNXLOmp93g4n5knno1NYDPulq3aRferel/SEjCDf8Pcnqp6sirdqQ Ymk2mzhiafHxH+bd8A6qYl2aA0e29uZaaL7eazsV1U2l951znT6BUEOu8TFRX9Xfqx o1VfPjA5TQsbc5vAc07RGSOFxKTRU6ePr06dCH3nC2quc3jEODFVpXOg2obzyl514+ PmQQFaJMSkE/g== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This doesn't fix anything broken, just for simplifying the code a little while we're rebuilding the world anyway. IMHO this makes the code a little more readable. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Don't refer to the association list 'outputs', use #$output, #$output:doc and #$output:static instead. --- gnu/packages/tls.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9de9a78e84..90211c733d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -347,7 +348,7 @@ required structures.") #$@(if (%current-target-system) #~((add-before 'configure 'set-cross-compile - (lambda* (#:key target outputs #:allow-other-keys) + (lambda* (#:key target #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" (cond @@ -371,8 +372,8 @@ required structures.") "linux-ppc")))))) #~()) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (lambda _ + (let* ((out #$output) (lib (string-append out "/lib"))) ;; It's not a shebang so patch-source-shebangs misses it. (substitute* "config" @@ -398,23 +399,23 @@ required structures.") #~((getenv "CONFIGURE_TARGET_ARCH")) #~()))))) (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Move static libraries to the "static" output. - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (lib (string-append out "/lib")) - (static (assoc-ref outputs "static")) + (static #$output:static) (slib (string-append static "/lib"))) (for-each (lambda (file) (install-file file slib) (delete-file file)) (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Move man3 pages and full HTML documentation to "doc". - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (man3 (string-append out "/share/man/man3")) (html (string-append out "/share/doc/openssl")) - (doc (assoc-ref outputs "doc")) + (doc #$output:doc) (man-target (string-append doc "/share/man/man3")) (html-target (string-append doc "/share/doc/openssl"))) (copy-recursively man3 man-target) @@ -423,13 +424,12 @@ required structures.") (delete-file-recursively html)))) (add-after 'install 'remove-miscellany - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; The 'misc' directory contains random undocumented shell and Perl ;; scripts. Remove them to avoid retaining a reference on Perl. - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/share/openssl-" - #$(package-version this-package) - "/misc")))))))) + (delete-file-recursively (string-append #$output "/share/openssl-" + #$(package-version this-package) + "/misc"))))))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR") From patchwork Mon Jun 14 15:37:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30247 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 E6FB527BC81; Mon, 14 Jun 2021 16:51:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD28C27BC78 for ; Mon, 14 Jun 2021 16:51:57 +0100 (BST) Received: from localhost ([::1]:42216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsosW-0000RG-Sc for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof9-0000AT-B4 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof8-0007Ab-Te for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof8-0004F7-R6 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 19/37] openssl: Move documentation instead of copying and deleting it. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368508116206 (code B ref 49025); Mon, 14 Jun 2021 15:38:06 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:01 +0000 Received: from localhost ([127.0.0.1]:47543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof3-0004DI-Cu for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:01 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof2-0004Ah-A3 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:00 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3dz2500X0mfAB4063dzCb; Mon, 14 Jun 2021 17:37:59 +0200 Message-ID: <9ab608462ae4c89963a8c4c0eb15a50e554e9c98.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:59 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685080; bh=te925f3EUl5smCK7r5p7vBFmEOA/ftcMQdqMDBtfvz4=; h=Subject:From:To:Date:In-Reply-To:References; b=MyxNWdZspEj6EHhr2527rXqq7ChKqpwoI/qXhuAYKlSs5UmaMxdp+VoovExdpmRUM Xan7l4P5lYvQMXZUEltmWYG8SLSzBbyoW1HqMW7cSU/Nk0jZYeGcP8bvG4VCjIi4gW TeGWfxM+KSTHVS0hwr+iJL4kSNPzliNkGkK+g6gANMHr1RL/PcEPTXErh9FdusMx+B zRnpCt+PAEO593wAJpDVqfHpoyzMvJkE9rYIqUcoOmetxeM1t6iuEGlod4zLSP+XE7 G3sQ/ctSlyve8/Mut8Fti4ElBcW8m5BbiMNU8xLCK7O2BWyQNv5FMDrEyf7lvw+7yz qDY0cs5wEePVA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (openssl)[arguments]<#:phases>{move-extra-documentation}: Use 'rename-file' instead of 'copy-recursively' and 'delete-file-recursively'. --- gnu/packages/tls.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 90211c733d..9aa0b5a212 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -418,10 +418,10 @@ required structures.") (doc #$output:doc) (man-target (string-append doc "/share/man/man3")) (html-target (string-append doc "/share/doc/openssl"))) - (copy-recursively man3 man-target) - (delete-file-recursively man3) - (copy-recursively html html-target) - (delete-file-recursively html)))) + (mkdir-p (dirname man3-target)) + (mkdir-p (dirname html-target)) + (rename-file man3 man-target) + (rename-file html html-target)))) (add-after 'install 'remove-miscellany (lambda _ From patchwork Mon Jun 14 15:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30252 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 27D4327BC81; Mon, 14 Jun 2021 16:53:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D7C3627BC78 for ; Mon, 14 Jun 2021 16:53:53 +0100 (BST) Received: from localhost ([::1]:45742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsouO-0002pf-W0 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:53:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh1-0006lU-9p for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh0-0008LY-VB for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh0-0004MV-SM for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 20/37] openssl: Move all man pages to separate output, not only man3. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368515416655 (code B ref 49025); Mon, 14 Jun 2021 15:40:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:14 +0000 Received: from localhost ([127.0.0.1]:47632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogE-0004KZ-Kt for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:14 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogD-0004AR-AR for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:13 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3fC2500Z0mfAB4063fC9m; Mon, 14 Jun 2021 17:39:13 +0200 Message-ID: <67bd5a45aa9417d5cd4951bb81f735009e394d33.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:12 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685153; bh=YefIBm54JXiBA/lxKUazz/VHLkxjp6CMX+RuiX1svAk=; h=Subject:From:To:Date:In-Reply-To:References; b=jLk8Z04GLMTvUwy/kyla1ypvxEsJlJoIv1lUcAaDnTcLAxDQdcacc35DBSIh2nzcd B77TifN5ONC/FiCbb2h5oEFRVtMIaDMbIYj0n5OQbPPV45+zDuUMLzT2YNRk5r4IL9 qf+FVgOZbZTkmXHMqrYpLQNPwzG9s5I2px2cIdRvKWZExrDKsSTK/GyFi6TAefJe9V 8cyAXEz8IgsDyCT2H5enCNgxCSW8sRzUNMkToKsB6XaTmLaZeFrqnSTbsnNPxeY0CR SQQdz8ELTBAjmXQIEXlrPJPX4xwCWHpJtMBMi6bgcbtRad720KbtPRm5wLMFOrByJf 38lK3FverX8OA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches There does not seem to be any reason to only move man3 pages. So, move all man pages to a separate output for documentation. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>{move-extra-documentation}: Move all man pages, not only man3. --- gnu/packages/tls.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9aa0b5a212..c178806805 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -411,16 +411,16 @@ required structures.") (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation (lambda _ - ;; Move man3 pages and full HTML documentation to "doc". + ;; Move man pages and full HTML documentation to "doc". (let* ((out #$output) - (man3 (string-append out "/share/man/man3")) - (html (string-append out "/share/doc/openssl")) + (man (string-append out "/share/man")) + (html (string-append out "/share/doc/openssl")) (doc #$output:doc) - (man-target (string-append doc "/share/man/man3")) + (man-target (string-append doc "/share/man")) (html-target (string-append doc "/share/doc/openssl"))) - (mkdir-p (dirname man3-target)) + (mkdir-p (dirname man-target)) (mkdir-p (dirname html-target)) - (rename-file man3 man-target) + (rename-file man man-target) (rename-file html html-target)))) (add-after 'install 'remove-miscellany From patchwork Mon Jun 14 15:38:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30255 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 9D72B27BC81; Mon, 14 Jun 2021 16:57:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 72EC427BC78 for ; Mon, 14 Jun 2021 16:57:39 +0100 (BST) Received: from localhost ([::1]:57124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoy2-0002VO-IR for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:57:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof9-0000BF-Jg for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof9-0007Ay-9C for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof9-0004FE-7Y for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 21/37] openssl: Find bin/env when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368508516295 (code B ref 49025); Mon, 14 Jun 2021 15:38:07 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:05 +0000 Received: from localhost ([127.0.0.1]:47556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof7-0004Eg-Jz for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:05 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsof5-0004AR-Qa for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:04 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3e32500C0mfAB4063e3xw; Mon, 14 Jun 2021 17:38:03 +0200 Message-ID: <4dd136f941566e2aec0e86121a40cb2d38952d38.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:03 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685083; bh=uCLyFHAdGzsxq1oiuobOF0Zs8lLgSM/ioa9UNVIbOb8=; h=Subject:From:To:Date:In-Reply-To:References; b=jU69cewSYlwaauhp5cQK0SN6Ni6KtMK5W55hl5jfs9shF0Ww4w2tWQ9k2rC/iqPnc kpY6hcr7n5sFc8f2kpYFZ7ZXVAj3PH95B5kTUnxmAcyldAma5bjQ2RpwzVsmD0IPUf myXiAnb2uTwl5zl2LLzNpVv/9a8+x0SSZalNNCRD1G0koT2LWQ28umcpT5gPzDmq5A BbDASFUBMyy/18a9qJnFP3X+MEmIzZ+ILSh3tAtEzRbBSnfc8Z340MLG6fi50kBKol I/u8Sx8Tq8qRhy3kfsUCAVFIzNOvyMvpL4kzzHnULgXt0yKBecoLMPKY/0poFuKNR5 q7wmbSwVJYQOw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so find bin/env by another way. * (openssl)[arguments]<#:phases>{configure}: Don't use '%build-inputs', use 'which' instead. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c178806805..a4e754e27f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -376,10 +376,10 @@ required structures.") (let* ((out #$output) (lib (string-append out "/lib"))) ;; It's not a shebang so patch-source-shebangs misses it. + ;; Don't use (assoc-ref %build-inputs "coreutils"), as + ;; %build-inputs is not defined when cross-compiling. (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) + (("/usr/bin/env") (which "env"))) (invoke #$@(if (%current-target-system) #~("./Configure") #~("./config")) From patchwork Mon Jun 14 15:38:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30240 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 01B8127BC78; Mon, 14 Jun 2021 16:47:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A225727BC78 for ; Mon, 14 Jun 2021 16:47:07 +0100 (BST) Received: from localhost ([::1]:54026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsonq-0006H9-Fj for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog1-0002sW-V0 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog1-0007ii-Lv for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog1-0004IT-K7 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368509316360 (code B ref 49025); Mon, 14 Jun 2021 15:39:01 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:13 +0000 Received: from localhost ([127.0.0.1]:47565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofB-0004Fe-Rv for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:13 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofA-00049r-1g for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:08 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3e72500N0mfAB4013e7VT; Mon, 14 Jun 2021 17:38:07 +0200 Message-ID: <21aa622c4f4153b6b4d3c61118a3f08b98a9ab13.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:07 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685087; bh=SB2vME/5ejSsqY2A+fZfvee8EhsMpmKKjvlHX221cOE=; h=Subject:From:To:Date:In-Reply-To:References; b=avcTg39Q8UF3nztM66WemRNpu7RSh9g8FP3PIUnxLVNgOLlzIebpT25uH0O1jSatO i1h1kT8pemU+lGqaCEgvRhlK8irdrqrYBjkxMoMJ2I0iRR9nqCPTmFXcqX0+UZ7xVe l7OY6Ee40DhCRqj4JqZOhZoYXugNwotDTCHkLmJDgM+2zqsezXwNM7LFDY//F4f02i fiZ+2/XC6+V9jVo8qwP6Jch39ntfLDj3to1o508OBOT0f2iNmWjsfVLaerlFCyw66F CNsPT5y6vGz/3c53Yyl21srigaUW8W3jViD+EjijOKuqOVGRQcGJ1WzKkAnmBy3Th4 /RJGwUg1CARlw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches By computing this value outside the build code, new targets can be added without causing rebuilds for other targets. * gnu/packages/tls.scm (target->openssl-target): New procedure. (openssl)[arguments]<#:phases>{set-cross-compile}: Use it. --- gnu/packages/tls.scm | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a4e754e27f..af91e42888 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -313,6 +313,31 @@ required structures.") (define-public guile3.0-gnutls (deprecated-package "guile3.0-gnutls" gnutls)) +(define (target->openssl-target target) + "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling +OpenSSL for TARGET." + ;; Keep this code outside the build code, + ;; such that new targets can be added + ;; without causing rebuilds for other targets. + (cond ((string-prefix? "i586" target) + "hurd-x86") + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "mips64el" target) + "linux-mips64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64") + ((string-prefix? "powerpc64le" target) + "linux-ppc64le") + ((string-prefix? "powerpc64" target) + "linux-ppc64") + ((string-prefix? "powerpc" target) + "linux-ppc"))) + (define-public openssl (package (name "openssl") @@ -351,25 +376,8 @@ required structures.") (lambda* (#:key target #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" - (cond - ((string-prefix? "i586" target) - "hurd-x86") - ((string-prefix? "i686" target) - "linux-x86") - ((string-prefix? "x86_64" target) - "linux-x86_64") - ((string-prefix? "mips64el" target) - "linux-mips64") - ((string-prefix? "arm" target) - "linux-armv4") - ((string-prefix? "aarch64" target) - "linux-aarch64") - ((string-prefix? "powerpc64le" target) - "linux-ppc64le") - ((string-prefix? "powerpc64" target) - "linux-ppc64") - ((string-prefix? "powerpc" target) - "linux-ppc")))))) + #$(target->openssl-target + (%current-target-system)))))) #~()) (replace 'configure (lambda _ From patchwork Mon Jun 14 15:38:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30271 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 CD6FF27BC81; Mon, 14 Jun 2021 17:08:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9467D27BC78 for ; Mon, 14 Jun 2021 17:08:49 +0100 (BST) Received: from localhost ([::1]:54688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp8q-0003tW-N0 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:08:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp78-0001jN-D3 for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp78-0008LD-4T for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp77-00054b-W0 for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 23/37] readline: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368678719423 (code B ref 49025); Mon, 14 Jun 2021 16:07:01 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:27 +0000 Received: from localhost ([127.0.0.1]:47689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6Y-00053B-Dk for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:26 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofT-00049r-Oz for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:28 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3eT250090mfAB4013eTZq; Mon, 14 Jun 2021 17:38:27 +0200 Message-ID: <78483ba71b04fd12db1590219bb39dc50b4dd132.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:27 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685107; bh=CZJeUp6JmOCwM4DkHRJdUG+kJ/hSfhI2SBJhxwqqUuk=; h=Subject:From:To:Date:In-Reply-To:References; b=nw0ZD54QrgxpjJHKiFlZwEvEirTQwKuVrMuwDow4k5xzeNrucu4oLUZeYDCVPvwzA Y7y0Cj9sjQjGQaesbTxumn2hUavXL/mo2gd+SvV+83y+JIwiKC/ybherEwm4FvRRsg qHnkQvnVQ9eJchXM6rhJHduIvDv7VbsA9I1puMDNU1dU3lf1Wnz5Iav4FFVmGc6qdJ WF2U32lYl+GeahE9rizZ6b5dIpzgLOrbG9rKp0FM/1TzIPxyws3RQtuLCatgKO3EYu WUleW8BOSx1xSYXSqwpsMA/E6rKoxFj3eYACMSXukPU17gXNQKoubropgxWaUxrMHA qQn9BHyPIsMjA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allos using ungexp and this-package-input later. * gnu/packages/readline.scm (readline)[arguments]<#:configure-flags>: Make this a G-expression. --- gnu/packages/readline.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index b4c91675a4..6cfa24c666 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (ice-9 format)) (define (patch-url version seqno) @@ -76,19 +77,19 @@ (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) (arguments `(#:configure-flags - (list (string-append "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib") + ,#~(list (string-append "LDFLAGS=-Wl,-rpath -Wl," + (assoc-ref %build-inputs "ncurses") + "/lib") - ;; This test does an 'AC_TRY_RUN', which aborts when - ;; cross-compiling, so provide the correct answer. - ,@(if (%current-target-system) - '("bash_cv_wcwidth_broken=no") - '()) - ;; MinGW: ncurses provides the termcap api. - ,@(if (target-mingw?) - '("bash_cv_termcap_lib=ncurses") - '())) + ;; This test does an 'AC_TRY_RUN', which aborts when + ;; cross-compiling, so provide the correct answer. + #$@(if (%current-target-system) + '("bash_cv_wcwidth_broken=no") + '()) + ;; MinGW: ncurses provides the termcap api. + #$@(if (target-mingw?) + '("bash_cv_termcap_lib=ncurses") + '())) ,@(if (target-mingw?) ;; MinGW: termcap in ncurses From patchwork Mon Jun 14 15:38:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30243 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 3F5C427BC81; Mon, 14 Jun 2021 16:47:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F163927BC78 for ; Mon, 14 Jun 2021 16:47:45 +0100 (BST) Received: from localhost ([::1]:56556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsooT-0007yM-0u for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog4-000324-BN for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog4-0007jq-2E for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog4-0004JH-0K for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 24/37] readline: Fix build error when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368511616436 (code B ref 49025); Mon, 14 Jun 2021 15:39:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:36 +0000 Received: from localhost ([127.0.0.1]:47587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofY-0004Gz-M6 for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:35 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofX-0004AR-Qb for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:32 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3eX250080mfAB4063eX3f; Mon, 14 Jun 2021 17:38:31 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:31 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685111; bh=RKxkeCHfovsAToDBHfs64Zan6oKgzXW30j7DLxYwIyo=; h=Subject:From:To:Date:In-Reply-To:References; b=YyHJPyLZgXSXnnDpUnxQHuR/H3rgGYDxxtovR+eMDxG7qgv7jlFLs270hekq05O/J Uzc6BoZZ4Z7Q6Sy+Zix5yC/AMhfPppMOexHC+Gx5Yht4Y0SYBs0flQS8XeFJuykQqN ncpFryNHpWCUlfP9VlmRahiOZv3PjqcltAAw0tdSVwXZI2fIPkhxBD17mY3XRO/TkG yvtH9YvoeFxNymq0rPtphtrbAhUCYlqtmHRF5mGyRg0+U4JUnrYNyalSYn+Ay7JD+Z kY0dMuGXUcIgKNKh51cTD6EnJN0ar2B6nnrIwuGIGW7VCv07Vysa9booyzS5Y3FY+f cJ/4Llgm3XQ1A== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so use this-package-input instead. * gnu/packages/readline.scm (readline)[arguments]<#:configure-flags>: Use this-package-input instead of %build-inputs. --- gnu/packages/readline.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 6cfa24c666..f9f2797247 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,9 +78,10 @@ (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) (arguments `(#:configure-flags - ,#~(list (string-append "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib") + ,#~(list (string-append + "LDFLAGS=-Wl,-rpath -Wl," + #$(this-package-input "ncurses") + "/lib") ;; This test does an 'AC_TRY_RUN', which aborts when ;; cross-compiling, so provide the correct answer. From patchwork Mon Jun 14 15:38:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30249 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 AB3EA27BC81; Mon, 14 Jun 2021 16:52:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7304327BC78 for ; Mon, 14 Jun 2021 16:52:44 +0100 (BST) Received: from localhost ([::1]:43554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsotH-0001L9-Fs for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:52:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog4-00033e-Nb for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog4-0007kW-E1 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog4-0004JO-Ca for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 25/37] bash: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368512016452 (code B ref 49025); Mon, 14 Jun 2021 15:39:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:40 +0000 Received: from localhost ([127.0.0.1]:47591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoff-0004HH-UC for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:40 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofe-0004Ah-FP for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:38 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3ed2500R0mfAB4063eeJi; Mon, 14 Jun 2021 17:38:38 +0200 Message-ID: <41a77275fd874e715de39219e0d1798d71519164.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:37 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685118; bh=5xbDPLdRjbOi0V9Px4ElNJStLkpmVkRsZpnjmjhWdEA=; h=Subject:From:To:Date:In-Reply-To:References; b=m7lzH2Rcys+hS+YbAAglLLIhcl0IG5TQvLhu3I6Tk28MOma7rzEzT4DfuNpuYOKFj XWKNylFUrfWj35uz05AgKD4vSa3L+6GiKL1TU6e+o7fKkMarl1FH+lT16pOXRyI78r Dp7Jne55kxLiYP7gvYEMQ5aRmby3j6Ib5yCyOSppxP3JtxMkL7RXL8aUCvI9B9ew61 LpS2M0kMvoeC9iAE4mONE9IHFzlOyfL3aJMYcGzoa7yqWnyrLBWGmtI3+LA5QUvv7k xQy8MuDsxdS4PdlUz2pOr1hGd6hC5Xyrb0TKC5yA4e+s+DBUkpYL6D2bCe2DhGasz6 08bFI0YT4tc+g== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using this-package-input later. * gnu/packages/bash.scm (bash)[arguments]<#:configure-flags>: Make this a G-expression instead of a raw S-expression. --- gnu/packages/bash.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 7e98367bbb..b3af873a66 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -109,15 +109,15 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." "-DSSH_SOURCE_BASHRC") " ")) (configure-flags - ``("--with-installed-readline" - ,,(string-append "CPPFLAGS=" cppflags) - ,(string-append - "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "readline") - "/lib" - " -Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib"))) + #~`("--with-installed-readline" + ,#$(string-append "CPPFLAGS=" cppflags) + ,(string-append + "LDFLAGS=-Wl,-rpath -Wl," + (assoc-ref %build-inputs "readline") + "/lib" + " -Wl,-rpath -Wl," + (assoc-ref %build-inputs "ncurses") + "/lib"))) (version "5.1")) (package (name "bash") @@ -143,8 +143,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." `(;; When cross-compiling, `configure' incorrectly guesses that job ;; control is missing. #:configure-flags ,(if (%current-target-system) - `(cons* "bash_cv_job_control_missing=no" - ,configure-flags) + #~(cons* "bash_cv_job_control_missing=no" + #$configure-flags) configure-flags) ;; Bash is reportedly not parallel-safe. See, for instance, From patchwork Mon Jun 14 15:38:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30273 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 91FE027BC81; Mon, 14 Jun 2021 17:09:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 25ADE27BC78 for ; Mon, 14 Jun 2021 17:09:12 +0100 (BST) Received: from localhost ([::1]:55556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp9D-0004Uw-83 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp7B-0001oa-0S for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp7A-0008NA-5S for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp7A-00055D-0K for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 26/37] bash: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368679419464 (code B ref 49025); Mon, 14 Jun 2021 16:07:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:34 +0000 Received: from localhost ([127.0.0.1]:47699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6f-00053n-Rg for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofi-00049r-R5 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:43 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3ei250060mfAB4013eic1; Mon, 14 Jun 2021 17:38:42 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:42 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685122; bh=QW0tjiTW+CkVuxysVui/WJvw5+glTVXo+zI/KaKqgX4=; h=Subject:From:To:Date:In-Reply-To:References; b=TiJK7VkG475DJXkWBFH75Fcn2P9CV2Pzgx3ZAaTubSp0cZjLtgt8TTAm0K4Ioo8wU pw7QITvWg8DJ1rETviDtra8XfBqbnA8mHFtHFNluX3dt5ZWqcc/a1wx6hbXjxbknxb rl03r3tYDMLq8MGNn/DkWJWs1PaVs7s9eyRX8U6s4+PITkEO/Mct09IeEokFI/mak2 YvTo37bjoNLGDSG+dFUlbK2VawMbdLW3pPDGrKHh6smCHm0ku1evrCqRMJ9xZ+Zc3d 0/RL3/vNQq8llewIGJ/LdswBe741gteZBLrkThl7qEEMOM6wUv5+apaQVfkt3W2ys7 JJm0A+SPGn84A== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so use this-package-input instead. * gnu/packages/bash.scm (bash)[arguments]<#:configure-flags>: Use this-package-input instead of %build-inputs. --- gnu/packages/bash.scm | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index b3af873a66..d51ab26bc8 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -103,22 +103,25 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." 1)) (define-public bash - (let* ((cppflags (string-join '("-DDEFAULT_PATH_VALUE='\"/no-such-path\"'" - "-DSTANDARD_UTILS_PATH='\"/no-such-path\"'" - "-DNON_INTERACTIVE_LOGIN_SHELLS" - "-DSSH_SOURCE_BASHRC") - " ")) - (configure-flags - #~`("--with-installed-readline" - ,#$(string-append "CPPFLAGS=" cppflags) - ,(string-append - "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "readline") - "/lib" - " -Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib"))) - (version "5.1")) + (let ((cppflags (string-join '("-DDEFAULT_PATH_VALUE='\"/no-such-path\"'" + "-DSTANDARD_UTILS_PATH='\"/no-such-path\"'" + "-DNON_INTERACTIVE_LOGIN_SHELLS" + "-DSSH_SOURCE_BASHRC") + " ")) + (version "5.1")) + ;; Delay expansion to inside a lexical environment + ;; where this-package is bound. + (define-syntax configure-flags + (identifier-syntax + #~`("--with-installed-readline" + ,#$(string-append "CPPFLAGS=" cppflags) + ,(string-append + "LDFLAGS=-Wl,-rpath -Wl," + ;; %build-inputs does not exist when cross-compiling, + ;; so use this-package-input instead. + #$(file-append (this-package-input "readline") "/lib") + " -Wl,-rpath -Wl," + #$(file-append (this-package-input "ncurses") "/lib"))))) (package (name "bash") (source (origin From patchwork Mon Jun 14 15:38:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30250 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 D6CEC27BC81; Mon, 14 Jun 2021 16:53:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9337427BC78 for ; Mon, 14 Jun 2021 16:53:08 +0100 (BST) Received: from localhost ([::1]:44208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsotf-0001mv-MH for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog5-00035O-2L for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog4-0007l9-QC for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog4-0004JW-On for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 27/37] fontconfig: Make the #:configure-flags argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368512716472 (code B ref 49025); Mon, 14 Jun 2021 15:39:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:47 +0000 Received: from localhost ([127.0.0.1]:47597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofn-0004Hc-5e for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:47 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofm-0004AR-6V for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:46 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3el2500L0mfAB4063el5Y; Mon, 14 Jun 2021 17:38:45 +0200 Message-ID: <008530a77ab5e357e737ff63d4594ceeaaf76a62.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:45 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685125; bh=Tob/oPvFnoA1kgM2N+Dv+i+7eWQPp7DgUwlFvYv3VIo=; h=Subject:From:To:Date:In-Reply-To:References; b=q2ppO3lttRap0x8sBFTlRtsXbgxiwU8E9JV14jzx5s6fibMMGCJqr7Bg84EfNEtdf 5uhPvXM6n/SvNpb8zqEYPnE5tGTYsOsi63yHLiToIv0bbUK/PXoDTvYlL5tAmfbYV6 LZfy/idDKgK8KXYpaa1MXNDtPb04tT8m9Z6ruPWPVqo0XRt1SqT24/y3kTL6zA55gM gfCyG/9ZI09oyyrbdfkMPoTTeTirJhsWsPyFYCD7123l+1s6wznu6x9Cvc2FIhiqv0 phzHOiBhbdFfaqVjpEwlRymcu0f4MMAlzUNS6bygG8wKdZobNh4acLCwpMg/PLQC3J zEAH1fvIG+JRw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using #$(this-package-input ...) later. * gnu/packages/fontutils.scm (fontconfig)[arguments]<#:configure-flags>: Make this a G-expression instead of a raw S-expression. (fontconfig-with-documentation)[arguments]<#:configure-flags>: Likewise. --- gnu/packages/fontutils.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index dbce5beba8..234f11129a 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages tex) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix svn-download) @@ -347,6 +348,7 @@ Font Format (WOFF).") ("python" ,python-minimal))) ;to avoid a cycle through tk (arguments `(#:configure-flags + ,#~ (list "--disable-docs" "--with-cache-dir=/var/cache/fontconfig" ;; register the default fonts @@ -400,7 +402,7 @@ high quality, anti-aliased and subpixel rendered text on a display.") (arguments (substitute-keyword-arguments (package-arguments fontconfig) ((#:configure-flags configure-flags) - `(delete "--disable-docs" ,configure-flags)) + #~(delete "--disable-docs" #$configure-flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-after 'install 'move-man-sections From patchwork Mon Jun 14 15:38:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30257 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 8918E27BC81; Mon, 14 Jun 2021 16:58:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 506AC27BC78 for ; Mon, 14 Jun 2021 16:58:15 +0100 (BST) Received: from localhost ([::1]:58470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoyc-0003Wh-BY for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog5-000370-GG for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog5-0007lI-7X for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog5-0004Jd-5r for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 28/37] fontconfig: Fix build error when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368513116490 (code B ref 49025); Mon, 14 Jun 2021 15:39:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:51 +0000 Received: from localhost ([127.0.0.1]:47601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofr-0004Hu-D4 for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:51 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofq-0004Ah-9p for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:50 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3ep2500X0mfAB4063epME; Mon, 14 Jun 2021 17:38:50 +0200 Message-ID: <945171e6c288773a500fa10ffa6dd945fdf1172f.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:49 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685130; bh=1XnIP0FFB67ygBf4Lh4m4zUhIvtCGWYv89LLbNkPgnc=; h=Subject:From:To:Date:In-Reply-To:References; b=Q6D1YX89wNVaBemq8wSP9fsi6vcsCdXhJjSdLQ3qajNZRKgnj3mUtADmhpUKwu7P9 P9gBptul/Y/aLaZoQsZAH5sH9RzOF7CAGshaNsOJ1edZMy8A4mY4MBIJaxPKr07ql7 WwvCWpdEXfAFPAzJYFj1cPdrsai6XZgW5ndIMQWVO3bar0oPHIQr6tYlDOc+O2DDaV fEDrzL0M+Zyl/qqVoLGZUn2up6jJcb5/vr/p5v9/uqIgL1dTqWmuIkEJbmDn/fXQlx E18kMNOsMq1Cc4ZiJygd0I/8ZdASrVBhV7jHDgquQNDQf3YPI8uUL2WRXqtlPobFMd HTDhMaAcETEZg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so use #$(this-package-input ...) instead. * gnu/packages/fontutils.scm (fontconfig)[arguments]<#:configure-flags>: Use this-package-input instead of %build-inputs. --- gnu/packages/fontutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 234f11129a..b0d40efeae 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -353,8 +353,8 @@ Font Format (WOFF).") "--with-cache-dir=/var/cache/fontconfig" ;; register the default fonts (string-append "--with-default-fonts=" - (assoc-ref %build-inputs "font-dejavu") - "/share/fonts") + #$(file-append (this-package-input "font-dejavu") + "/share/fonts")) ;; Register fonts from user and system profiles. (string-append "--with-add-fonts=" From patchwork Mon Jun 14 15:38:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30265 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 394F427BC81; Mon, 14 Jun 2021 17:02:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB92127BC78 for ; Mon, 14 Jun 2021 17:02:05 +0100 (BST) Received: from localhost ([::1]:40948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp2K-0002cm-Vs for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:02:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog5-00038o-SS for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog5-0007lP-KH for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog5-0004Jp-Ie for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 29/37] glib: Use a correct python in scripts when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368514316549 (code B ref 49025); Mon, 14 Jun 2021 15:39:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:03 +0000 Received: from localhost ([127.0.0.1]:47607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofy-0004ID-Jw for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofw-0004AR-CA for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:56 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3ev2500X0mfAB4063ew7D; Mon, 14 Jun 2021 17:38:56 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:55 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685136; bh=XiQuYZveIJ8Rgxyv4aIZHjDU0wzSbBF/g7pC1SfJSRI=; h=Subject:From:To:Date:In-Reply-To:References; b=GtzJBWiu5ttlKxOPjLakC1XDko/JpnVb1A8x3XGjPndIMuvup2QsTUxRoVPYv/I+J DtiQ6vxhxDSRKUd/FE1o0VcarDgcf1IdKOJNUj9pjO3OuM0z6osNZAbYhA5zIRf7PX NE08p2EgEe08TXIudQ9/8uHnzoGHVELp42BhwHHYry07Fi/W5BFaS324y4kgLzj2AR ZWlBtfkUIx3wirwo7eBn6zZH04DwPLFRAq9Krn8Q/gutZwXagcFTNMl0HPrA8MYX2U s/aGUtsMQKhBDbDCVgezJ+kt35c1InSr2qkukapy2cpd7iY3eX+2bnnoWgDhrIi0gc lryl6adwIXYqg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches During the build, a native python should be used as these scripts will be invoked during the build, but when installed, they should be a python for the system we're compiling for. * gnu/packages/glib.scm (glib)[arguments]<#:phases>{patch-python-references}: Look up "python" in 'native-inputs', not 'inputs'. (glib)[inputs]{python,python-wrapper,bash-minimal}: New inputs. --- gnu/packages/glib.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 94276ae0ef..25c5ae494b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Arthur Margerit +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,14 +223,19 @@ shared NFS home directories.") #t)) ;; Python references are not being patched in patch-phase of build, ;; despite using python-wrapper as input. So we patch them manually. + ;; + ;; These python scripts are both used during build and installed, + ;; so at first, use a python from 'native-inputs', not 'inputs'. When + ;; cross-compiling, the 'patch-shebangs' phase will replace + ;; the native python with a python from 'inputs'. (add-after 'unpack 'patch-python-references - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" "glib/gtester-report.in" "gobject/glib-genmarshal.in" "gobject/glib-mkenums.in") (("@PYTHON@") - (string-append (assoc-ref inputs "python") + (string-append (assoc-ref (or native-inputs inputs) "python") "/bin/python" ,(version-major+minor (package-version python))))) @@ -282,6 +288,13 @@ shared NFS home directories.") ("xsltproc" ,libxslt))) (inputs `(("bash-completion" ,bash-completion) + ;; "python", "python-wrapper" and "bash-minimal" + ;; are for the 'patch-shebangs' phase, to make + ;; sure the installed scripts end up with a correct shebang + ;; when cross-compiling. + ("python" ,python) + ("python-wrapper" ,python-wrapper) + ("bash-minimal" ,(canonical-package bash-minimal)) ("dbus" ,dbus) ("libelf" ,libelf))) (propagated-inputs From patchwork Mon Jun 14 15:39:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30251 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 4587327BC81; Mon, 14 Jun 2021 16:53:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1225A27BC78 for ; Mon, 14 Jun 2021 16:53:32 +0100 (BST) Received: from localhost ([::1]:44900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsou3-0002HT-3m for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:53:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh0-0006ja-Rv for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh0-0008LT-GZ for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh0-0004MO-Cl for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368514616635 (code B ref 49025); Mon, 14 Jun 2021 15:40:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:06 +0000 Received: from localhost ([127.0.0.1]:47626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog6-0004KA-CU for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:06 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog5-0004AR-0a for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:05 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3f42500b0mfAB4063f48W; Mon, 14 Jun 2021 17:39:04 +0200 Message-ID: <5e7f30def92fa5a6403df07ca2f2f2e0434b6679.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:04 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685144; bh=ZU3ezvbLj96kkByIv7FSVytM9buN8I0jjvsF//5h2gI=; h=Subject:From:To:Date:In-Reply-To:References; b=ULHSb2pq37bP0mquCTR6oBB2yyEg2wRPV/F06hMqyXTBud/oKe2YoZxTO8zsPTa5Z DdnFgn4PsimzgZskcKsMkU7V2zoUKQIjZhUT3myIF3xZmgM3B8VABldPKXz4Qynh+X nrKfUZwZXwrw9Uei02Co1AWD1D4DBEmGykTSAvpCqr48H+uKr587mSvTuD6/E/wEgM N/NfYawss1/xxk5hU75DN87MMYwirGXIag9cR7urpUiB7czurA7RdsdjPMcDk1niLp G62k5QW3whENfh2ctfRRCN7QTT6/AjPBmews93JHap9uyiE/3xj5o7mOmA0Mvifrrg 8zHzZUyc7UNtw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (glib)[arguments]<#:disallowed-references>: Disallow the native python when cross-compiling. --- gnu/packages/glib.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 25c5ae494b..244544ea6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -77,6 +77,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) + #:use-module (srfi srfi-26) #:use-module ((srfi srfi-1) #:hide (zip)) ;; Export variables up-front to allow circular dependency with the 'xorg' @@ -200,7 +202,15 @@ shared NFS home directories.") (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python (arguments - `(#:disallowed-references (,tzdata-for-tests) + `(#:disallowed-references + (,tzdata-for-tests + ;; Verify glib-mkenums, gtester, ... use the cross-compiled + ;; python. + ,@(if (%current-target-system) + (map (cut gexp-input <> #:native? #t) + `(,(this-package-native-input "python") + ,(this-package-native-input "python-wrapper"))) + '())) #:configure-flags '("-Dman=true" "-Dselinux=disabled") #:phases From patchwork Mon Jun 14 15:39:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30266 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 944EF27BC81; Mon, 14 Jun 2021 17:02:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B3E727BC78 for ; Mon, 14 Jun 2021 17:02:25 +0100 (BST) Received: from localhost ([::1]:41428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp2e-0002yk-6z for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:02:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0006pj-FY for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0008Lt-6r for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh2-0004Ms-4x for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368517216710 (code B ref 49025); Mon, 14 Jun 2021 15:40:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:32 +0000 Received: from localhost ([127.0.0.1]:47648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogW-0004LS-6r for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:49724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogU-0004Kz-Oe for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:31 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3fW250050mfAB4013fWkZ; Mon, 14 Jun 2021 17:39:30 +0200 Message-ID: <79799f427dfcc7e916a033e1920d0eeffe5c1f0c.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:30 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685170; bh=21pHze+pHX1QUU3faZDVeyKHR5BWcrUM+up16DXtFFQ=; h=Subject:From:To:Date:In-Reply-To:References; b=oMebheRORtPQHAXtLGjqTa4FPg6o3Xddy5r+StsFo7OFQWzrE2rT7ZcRsuzIWV+bF ffoslRR9DrvVo3kRUoRHoWPIMgpYQLzXRqYMUT6LevQx2Sj1YQ7TLpz5Dv37a9mmQy XNVhHIQ2BsIFcZapfZSd0z7QHwn/h5G1vJJ3FjoHDjqfqhdZ5dz+UPSePJkfawNQsu Vseq4/tJIwjvGHIYYaihNf1Tfuxlyit1pnJ8qoAOagUWHMiPMbKsXD1haAfFIEvgnn 88rVuRT1Ic69G8Jxy2ieWp8h/5giCOScP1PAqvBrAyI20vHm07r58cGAFxFQitlMzE dXKlO2VQe2DIw== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Otherwise, "tzdata" won't be found when cross-compiling and string-append will complain about types. Alternatively, "tzdata" could be moved from 'native-inputs' to 'inputs'. * gnu/packages/glib.scm (glib)[arguments]<#:phases>{pre-check}: Look up "tzdata" in 'native-inputs', not 'inputs'. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 244544ea6f..57e8282a89 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -251,10 +251,11 @@ shared NFS home directories.") (package-version python))))) #t)) (add-before 'check 'pre-check - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") + (string-append (assoc-ref (or native-inputs inputs) + "tzdata") "/share/zoneinfo")) ;; Some tests want write access there. (setenv "HOME" (getcwd)) From patchwork Mon Jun 14 15:39:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30270 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 670E827BC81; Mon, 14 Jun 2021 17:08:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 35F1827BC78 for ; Mon, 14 Jun 2021 17:08:06 +0100 (BST) Received: from localhost ([::1]:52722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp89-0002Tc-A1 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp79-0001mA-KY for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36156) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp79-0008MU-C7 for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp79-00054y-7a for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 32/37] tk: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368679319451 (code B ref 49025); Mon, 14 Jun 2021 16:07:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:33 +0000 Received: from localhost ([127.0.0.1]:47695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6e-00053Y-Tz for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:33 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogG-0004AR-F3 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:16 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3fF2500G0mfAB4063fGAA; Mon, 14 Jun 2021 17:39:16 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:15 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685156; bh=qQfvdstxZy/XiIqaAZr+ob7/+xkbF3xy1OfG71JNARs=; h=Subject:From:To:Date:In-Reply-To:References; b=DiEiYzsN5T374kTjh4rNrsk6vAu+w3nkIUXmQ990QBdl/Zky15fncWRdcjeUZzVmt VZa2UMkhABxsOHPh7YkiF92CD3r836lRBZDMD89hF84hZoEch1GE8FE+qf8Dwwjb1A W3zCge+ha/x1UsjCRZEkps9yidVIiNFjBAjMbBhpiZZNwaqWLkKf6Uur9SNDq1v3qZ 7vLrA0JeM8b78jF/M6yauJ6tOEU9gYcQ6Lf4mHkgWEVJAqJ1ONP7vTrvkn2mkcYAiM 0g2wvhbeJJ/lsJy5Ehb1GoA/Bl9NG2SLoq+v+Tt0ZbA49BISZaDJSs30yhBjrTifNs OKdSRe1Qyl7eg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using #$(this-package-input ...) later. * gnu/packages/tcl.scm (tk)[arguments]<#:configure-flags>: Make this a G-expression instead of an S-expression. --- gnu/packages/tcl.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 5fccfa5da9..c87a8187f2 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -230,15 +230,16 @@ X11 GUIs.") "/lib -lfontconfig"))))))) #:configure-flags + ,#~ (list (string-append "--with-tcl=" (assoc-ref %build-inputs "tcl") "/lib") ;; This is needed when cross-compiling, see: ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247 - ,@(if (%current-target-system) - '("tcl_cv_strtod_buggy=1" - "ac_cv_func_strtod=yes") - '())) + #$@(if (%current-target-system) + #~("tcl_cv_strtod_buggy=1" + "ac_cv_func_strtod=yes") + #~())) ;; The tests require a running X server, so we just skip them. #:tests? #f)) From patchwork Mon Jun 14 15:39:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30269 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 7409627BC81; Mon, 14 Jun 2021 17:07:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 33E0227BC78 for ; Mon, 14 Jun 2021 17:07:51 +0100 (BST) Received: from localhost ([::1]:51988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp7u-0001uV-5y for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:07:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp7A-0001n2-0P for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36157) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp79-0008N3-P9 for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp79-000556-K4 for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 33/37] tk: Do not use %build-inputs when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368679419458 (code B ref 49025); Mon, 14 Jun 2021 16:07:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:34 +0000 Received: from localhost ([127.0.0.1]:47697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6f-00053g-H9 for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:33 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogN-00049r-GW for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:38 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3fN2500q0mfAB4013fPjQ; Mon, 14 Jun 2021 17:39:23 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:22 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685163; bh=ScieVaZk7mDw2fXbsDGfiO9S33uDMZnuFk/yBrk0aHY=; h=Subject:From:To:Date:In-Reply-To:References; b=aUX/V2K3xjCnf/HzhpxegfsyvRstb80w/3p/lievDKcmokW/5Z0+AOZgn/o00aioo RxeJLwwdTZzZwHoRVjsttRgq7Z647GUaDAmoDdRO5hIdhSEumWjEksM6z07EAH6cxs tXpXkrFqxyd8fWcBmJhP9ZPnYVvxqHS62qy6RCqTIA6HU1ldlNSBchgIOvggpGeNOc QYc6vf82wtkmv5R19YA/y9dKduJ48GBaP8QWGT4bI9N3WHSNDWUnGXka31Jmg25Tde MqMttdZNvo8BNCf9fp4yejMQDR9p87+uUNddfoVYPFjiDnWU7JbHeVXD36DyuD8Tvu +f/bCUk2jXj5g== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exists when cross-compiling, so use #$(this-package-input ...) instead. * gnu/packages/tcl.scm (tk)[arguments]<#:configure-flags>: Use 'this-package-input' instead of '%build-inputs' when cross-compiling. --- gnu/packages/tcl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index c87a8187f2..91ba8bbb3f 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -232,7 +233,9 @@ X11 GUIs.") #:configure-flags ,#~ (list (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") + #$(if (%current-target-system) + (this-package-input "tcl") + #~(assoc-ref %build-inputs "tcl")) "/lib") ;; This is needed when cross-compiling, see: ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247 From patchwork Mon Jun 14 15:39:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30245 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 6A32327BC81; Mon, 14 Jun 2021 16:48:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF83D27BC78 for ; Mon, 14 Jun 2021 16:48:11 +0100 (BST) Received: from localhost ([::1]:58270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoos-0000gj-Nn for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0006oN-0E for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh1-0008Lg-Ox for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh1-0004Md-B7 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 34/37] libelf: Use the cross-compiler when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368516816682 (code B ref 49025); Mon, 14 Jun 2021 15:40:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:28 +0000 Received: from localhost ([127.0.0.1]:47638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogM-0004Kt-SS for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:27 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogK-0004Ah-Cr for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:21 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3fK2500S0mfAB4063fLSU; Mon, 14 Jun 2021 17:39:20 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:19 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685160; bh=DabbH4RUth/E4FzEFM3DBGQcqxP4ogR++HjfYem7CfE=; h=Subject:From:To:Date:In-Reply-To:References; b=EhBHCdXsD6GXMszf53HfyxeF59cUe9B87NTduV2Y6p/PAqt2kXZYBvnM/6sQljHR8 jKGlFQkBS/qr1EhG+P4Rj3KLYURYsDeevNv99KTCduePAKPS+w8EKyBLKuPHSDtUZn CVX2hmxPAFQnfC40eOXSPrnSjfYV1n+BCzanjyiuLNBhUdSTmJ/MBMngge+SLTADOU peRGWbG8z3xz1rvk658eWi+phVmM3OLccoMN5tYe/0vh+opYtEL0rLwMXwZHPp1yMq 3CNJajijbIl+o/pbmTBdmI/HmgDVoM7lTz0kEvw3gaRwx20irLibR7Ke5cUpNBPy3P 3gOZPIUdZStgA== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/elf.scm (libelf)[arguments]<#:phases>{delete-configure}: Regenerate the configure script when cross-compiling. (libelf)[arguments]<#:phases>{configure}: Do not replace when cross-compiling. (libelf)[native-inputs]: Add autoconf when cross-compiling. --- gnu/packages/elf.scm | 48 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 0309dd95b5..66c2334e5c 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Mark Wielaard ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Leo Le Bouter +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+)) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages gcc) @@ -205,22 +207,36 @@ static analysis of the ELF binaries at hand.") (arguments `(#:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; This old `configure' script doesn't support - ;; variables passed as arguments. - (let ((out (assoc-ref outputs "out"))) - (setenv "CONFIG_SHELL" (which "bash")) - (invoke "./configure" - (string-append "--prefix=" out) - ,@(if (string=? "powerpc64le-linux" - (%current-system)) - '("--host=powerpc64le-unknown-linux-gnu") - '()) - ,@(if (string=? "aarch64-linux" - (%current-system)) - '("--host=aarch64-unknown-linux-gnu") - '())))))))) + ,(if (%current-target-system) + ;; This old 'configure' script doesn't + ;; support cross-compilation well. E.g., it fails + ;; to find the cross-compiler. + `(add-before 'bootstrap 'delete-configure + (lambda _ + (delete-file "configure"))) + `(replace 'configure + ;; This old `configure' script doesn't support + ;; variables passed as arguments. TODO: would + ;; simply regenerating 'configure' work + ;; well enough, even if compiling natively + ;; on powerpc or aarch64? + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CONFIG_SHELL" (which "bash")) + (invoke "./configure" + (string-append "--prefix=" out) + ,@(if (string=? "powerpc64le-linux" + (%current-system)) + '("--host=powerpc64le-unknown-linux-gnu") + '()) + ,@(if (string=? "aarch64-linux" + (%current-system)) + '("--host=aarch64-unknown-linux-gnu") + '()))))))))) + (native-inputs + (if (%current-target-system) + `(("autoconf" ,autoconf)) + '())) (home-page (string-append "https://web.archive.org/web/20181111033959/" "http://www.mr511.de/software/english.html")) (synopsis "ELF object file access library") From patchwork Mon Jun 14 15:39:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30258 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 D6A8627BC81; Mon, 14 Jun 2021 16:58:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C33E27BC78 for ; Mon, 14 Jun 2021 16:58:33 +0100 (BST) Received: from localhost ([::1]:59100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoyu-0003z6-OR for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsoh2-0006oZ-31 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36109) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsoh1-0008Li-QL for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsoh1-0004Ml-Np for guix-patches@gnu.org; Mon, 14 Jun 2021 11:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 35/37] opendht: Correct 'nettle' variable name in inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368517016696 (code B ref 49025); Mon, 14 Jun 2021 15:40:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:39:30 +0000 Received: from localhost ([127.0.0.1]:47644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogT-0004LD-Vo for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:30 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:49724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsogS-0004Kz-0a for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:28 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3fT250040mfAB4013fTk9; Mon, 14 Jun 2021 17:39:27 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:27 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685167; bh=Z5thBcyWNRrCQ24oZSKGWC6n45RVIObF1z0SwLUmYeg=; h=Subject:From:To:Date:In-Reply-To:References; b=iD7qgMFnR7qhXoO+94/UvCb5havj5M6lns4EqA1/V3M1RXvloKC4ZHnMoC+7xgjWg kHyUivD8WXYMp5o1JGqQrsctE8o9tbD/REpUdw+mtkN5SDJFt3KQZJg261wYa9SnlY S+FavkGr8dQGCtjFxoRqjjbczdLkYLN+ju+sgRgx+sSM4+AM+JRXpkaHLs9bkKvVMa O4s7M4r5+FsgNVp0gXZtyj9F0nTSVDj+tamsGQiWOFX0jkCcHdXUX0XHGbZv6IgqKv R0uiiS0fnv/aRelof9kukgvgraXpwE49TgafOedcx0vu5+u3VmOuycXZz/avnul5tk k4v9JXWA5iWDg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Previously, opendht referred to 'nettle-3.7'. But nettle-3.7 has been renamed to simply 'nettle'. So, refer to 'nettle' instead of 'nettle-3.7'. This should fix recent evaluation failures of core-updates on ci.guix.gnu.org. * gnu/packages/networking.scm (opendht)[inputs]{nettle}: Refer to 'nettle' instead of 'nettle-3.7'. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 62c4d7a392..6b154067b1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3478,7 +3478,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (build-system cmake-build-system) (inputs `(("argon2" ,argon2) - ("nettle" ,nettle-3.7) + ("nettle" ,nettle) ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) ;required for the DHT proxy From patchwork Mon Jun 14 15:38:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30256 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 4834627BC81; Mon, 14 Jun 2021 16:58:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0B82327BC78 for ; Mon, 14 Jun 2021 16:58:03 +0100 (BST) Received: from localhost ([::1]:57796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsoyO-00030C-OE for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog2-0002tk-Al for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog2-0007in-2W for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Ia-0z for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 36/37] cross-base: Fix cross-compiler for i686-linux-gnu. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368510216386 (code B ref 49025); Mon, 14 Jun 2021 15:39:01 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:22 +0000 Received: from localhost ([127.0.0.1]:47569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofF-0004Fp-Pm for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:22 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:41494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofD-0004AR-Kv for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:12 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id H3eB250050mfAB4063eBzz; Mon, 14 Jun 2021 17:38:11 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:11 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685091; bh=WplP20+eB7mSS6oq9iP70QmaGoawFZIEwLgO+cNm+aw=; h=Subject:From:To:Date:In-Reply-To:References; b=M1XL1VCQ/JIqJfNbS0E+jjEGp9cqx9B9fB0txie1AgAXUxAb5AQRgvD88WNQ9k0RO En0tkczhdEy4/WCw6sFBHe+OKv5ezM2iXm6L7G1z038m3McggMrJ7HgWQllHfnNq0H xrt+HMAChIYys8eCi+SQjSm+lw5aNm10sRWqP+ozt49IrSIQZcK8vS7hGxGZou5kut qG1gw+TteCEliKS14E37yzB8RbtAVsYqPVX76Y4fhXzZRO5Y6SGkkjTDge37o7oZ60 4yeIkKOil844KSaxQpq8feg/Qg60707NVQXm987e1fUvRp/DL4WojDnjkuaZhYysOq GUsUS/OfT8X4g== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches GCC doesn't find libgcc_s.so anymore and looks in the wrong location. Fix this (well, more a work-around really). * gnu/packages/cross-base.scm (cross-gcc-arguments)<#:configure-flags>: Add --with-toolexecdir, such that libstdc++ ends up in the right place. Add --with-slibdir such that libgcc_s.so end up in the right place. (cross-gcc-arguments)<#:phases>{move-shared-libraries}: New phase, moving libraries in the correct place. Delete .la files, libasan.so and libusan.so to prevent circular references. Likewise, fix a reference in libstdc++.so.VERSION-gdb.py. --- gnu/packages/cross-base.scm | 63 +++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 9487ac9238..995b4ae065 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) @@ -169,9 +171,26 @@ base compiler and using LIBC (which may be either a libc package or #f.)" )) ;; Install cross-built libraries such as libgcc_s.so in - ;; the "lib" output. + ;; the "lib" output. At least for version 8.4.0, GCC + ;; will put libstdc++ in ${toolexecdir}/lib instead. + ;; (A bug?) So set --with-toolexecdir as well. + ,@(if libc - `((string-append "--with-toolexeclibdir=" + `((string-append "--with-toolexecdir=" + (assoc-ref %outputs "lib")) + (string-append "--with-toolexeclibdir=" + (assoc-ref %outputs "lib") + "/" ,target "/lib")) + '()) + ;; At least for GCC 8.0, libgcc_s.so and libstdc++.so + ;; are not installed in the location specified in + ;; --with-toolexeclibdir so GCC will not find it + ;; when cross-compiling, say, GNU Hello. + ;; + ;; Work-around by specifying slibdir. This is not + ;; sufficient, see move-shared-libraries below. + ,@(if (and libc (version>=? (package-version xgcc) "8.0")) + `((string-append "--with-slibdir=" (assoc-ref %outputs "lib") "/" ,target "/lib")) '()) @@ -193,7 +212,45 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,flags)) flags)) ((#:phases phases) - `(cross-gcc-build-phases ,target ,phases)))))) + (if (and libc (version>=? (package-version xgcc) "8.0")) + #~(modify-phases (cross-gcc-build-phases #$target #$phases) + (add-after 'install 'move-shared-libraries + (lambda _ + (let* ((slib (format #f "~a/~a/lib/" #$output:lib #$target)) + (badlib (format #f "~a/~a/lib/" #$output #$target)) + (libs (map basename (find-files badlib #:fail-on-error? #t)))) + (for-each + (lambda (lib) + (let ((from (string-append badlib lib)) + (to (string-append slib lib))) + (when (file-exists? to) + (error "~a was found twice, refusing to overwrite!" + lib)) + ;; The debugging script libstdc++.so.VERSION-gdb.py has + ;; reference to #$output. Correct it. + (when (string-suffix? "-gdb.py" lib) + (substitute* from + (("libdir = '(.*)'") + (string-append "libdir = '" slib "'"))) + (system* "cat" from)) + ;; The .la files have references to BADLIB, + ;; leading to cyclic references between + ;; the outputs of the package. Remove them + ;; and hope noone notices. + ;; + ;; Likewise, libasan.so.* and libubsan.so.* + ;; have references to #$output. + (if (or (string-suffix? ".la" lib) + (string-prefix? "libasan.so" lib) + (string-prefix? "libubsan.so" lib)) + (delete-file from) + (rename-file from to)))) + libs) + ;; If you have "cyclic references" problems, + ;; uncomment this and use --keep-failed to figure + ;; things out. + (copy-recursively #$output:lib "out-test"))))) + #~(cross-gcc-build-phases #$target #$phases))))))) (define (cross-gcc-patches xgcc target) "Return GCC patches needed for XGCC and TARGET." From patchwork Mon Jun 14 15:39:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30272 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 6A21027BC81; Mon, 14 Jun 2021 17:09:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B11A27BC78 for ; Mon, 14 Jun 2021 17:09:00 +0100 (BST) Received: from localhost ([::1]:55118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp91-0004CJ-MM for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp78-0001k5-PD for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp78-0008M8-HT for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp78-00054j-Cg for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 37/37] meson: Support cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368679219436 (code B ref 49025); Mon, 14 Jun 2021 16:07:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:32 +0000 Received: from localhost ([127.0.0.1]:47691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6Y-00053E-S2 for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsog8-00049r-8e for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:39:09 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3f72500C0mfAB4013f7gf; Mon, 14 Jun 2021 17:39:07 +0200 Message-ID: <15c3653940316d32da0c4163c8f07507e6cd1c98.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:39:07 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685147; bh=Y0F3ZqZCn5kbWJTZDws1K2iyvKi2XMHLvWE0ucoM15w=; h=Subject:From:To:Date:In-Reply-To:References; b=pYwm/5rQYF+E4ltKKDrfg1XnCg6uWnhbQ78P2T0lS285lnbFkl9mEwEewiBhmXFZu 5LCy8IV0Ukn/s4htivbG2qgvJCN3Es3qSTCCBm7bo/e+nmWcaW8tgOOw/yaSXVb5ZX XlW5YcU0LI36PzPV80tduErDGFovInvvVW8qyo6NGb8/y/RrtjznL0XeQu4ob5HBIm Mh3gmFuPSOkvfIMQFta69dotgsyCpcDG7/ksiND08MNE8No1JwLIvVAx5X/b6H4l9i kOpgxC2iD2esXAgXV9PJJGRhwPtIFkuaCLzvPgM3vS6ohr13MFmz6AJ2RzG9AuYj8e 3PJdZL64P9HwQ== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches For cross-compilation, meson needs to be passed a ‘cross file’ with information on the architecture, CPU type, endianness and operating system, and the name of the cross-compiler binaries. The new module (guix build meson-configuration) has some utilities for writing these cross files, used by 'make-cross-file' in a G-exp. The values for the cross file are generated by 'make-machine-alist' and 'make-binaries-alist'. 'make-machine-alist' and 'make-binaries-alist' live on the host side, such that new architectures and operating systems can be added without causing rebuilds for old architectures. Currently, only GNU/Hurd, GNU/Linux, MinGW, x86-32 and x86-64 are supported by 'make-machine-alist'. For other architectures, someone needs to figure out what to use as ‘CPU type’ first. Only i686-linux-gnu has been tested. This has been tested with: $ ./pre-inst-env guix build glib --target=i686-linux-gnu on a x86_64-linux system. ‘If it compiles, it should work.’ * guix/build/meson-configuration.scm (configuration-port): New parameter. (write-section-header): New procedure. (write-assignment): New procedure. (write-assignments): New procedure. * guix/build-system/meson.scm (target-hurd?): New predicate. (make-machine-alist): New procedure. (make-binaries-alist): New procedure. (make-cross-file): New procedure. (meson-cross-build): New procedure. (lower)[build-inputs]: Add standard cross packages when cross-compiling. Do not include regular 'inputs' when cross-compiling. (lower)[host-inputs]: Include 'inputs' when cross-compiling. (lower)[target-inputs]: Add cross packages when cross-compiling. (lower)[build]: Call 'meson-cross-build' instead of 'cross-build' when cross-compiling. (lower)[target]: Set it. (lower)[private-keywords]: Do not remove #:target when cross-compiling. --- Makefile.am | 1 + guix/build-system/meson.scm | 197 ++++++++++++++++++++++++++--- guix/build/meson-configuration.scm | 71 +++++++++++ 3 files changed, 250 insertions(+), 19 deletions(-) create mode 100644 guix/build/meson-configuration.scm diff --git a/Makefile.am b/Makefile.am index a10e06e5a7..d4bf626fd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,6 +234,7 @@ MODULES = \ guix/build/emacs-utils.scm \ guix/build/java-utils.scm \ guix/build/lisp-utils.scm \ + guix/build/meson-configuration.scm \ guix/build/maven/java.scm \ guix/build/maven/plugin.scm \ guix/build/maven/pom.scm \ diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 5adc0f92c8..1f763af2aa 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,8 @@ #:use-module (guix packages) #:use-module (ice-9 match) #:export (%meson-build-system-modules - meson-build-system)) + meson-build-system + make-cross-file)) ;; Commentary: ;; @@ -40,6 +42,62 @@ ;; ;; Code: +(define (target-hurd? triplet) + (and (string-suffix? "-gnu" triplet) + (not (string-contains triplet "linux")))) + +(define (make-machine-alist triplet) + "Make an association list describing what should go into +the ‘host_machine’ section of the cross file when cross-compiling +for TRIPLET." + `((system . ,(cond ((target-hurd? triplet) "gnu") + ((target-linux? triplet) "linux") + ((target-mingw? triplet) "windows") + (#t (error "meson: unknown operating system")))) + (cpu_family . ,(cond ((target-x86-32? triplet) "x86") + ((target-x86-64? triplet) "x86_64") + ((target-arm32? triplet) "arm") + ((target-aarch64? triplet) "aarch64") + ((target-powerpc? triplet) + (if (target-64bit? triplet) + "ppc64" + "ppc")) + (#t (error "meson: unknown architecture")))) + (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 + (substring triplet 0 4)) + ((target-x86-64? triplet) "x86_64") + (#t (error "meson: unknown CPU")))) + (endian . ,(cond ((string-prefix? "powerpc64le-" triplet) "little") + ((string-prefix? "mips64el-" triplet) "little") + ((target-x86-32? triplet) "little") + ((target-x86-64? triplet) "little") + (#t (error "meson: unknown architecture")))))) + +(define (make-binaries-alist triplet) + "Make an associatoin list describing what should go into +the ‘binaries’ section of the cross file when cross-compiling for +TRIPLET." + `((c . ,(cc-for-target triplet)) + (cpp . ,(cxx-for-target triplet)) + (pkgconfig . ,(pkg-config-for-target triplet)) + (objcopy . ,(string-append triplet "-objcopy")) + (ar . ,(string-append triplet "-ar")) + (ld . ,(string-append triplet "-ld")) + (strip . ,(string-append triplet "-strip")))) + +(define (make-cross-file triplet) + (computed-file "cross-file" + (with-imported-modules '((guix build meson-configuration)) + #~(begin + (use-modules (guix build meson-configuration)) + (call-with-output-file #$output + (lambda (f) + (parameterize ((configuration-port f)) + (write-section-header "host_machine") + (write-assignments '#$(make-machine-alist triplet)) + (write-section-header "binaries") + (write-assignments '#$(make-binaries-alist triplet))))))))) + (define %meson-build-system-modules ;; Build-side modules imported by default. `((guix build meson-build-system) @@ -68,24 +126,34 @@ #:rest arguments) "Return a bag for NAME." (define private-keywords - `(#:meson #:ninja #:inputs #:native-inputs #:outputs #:target)) - - (and (not target) ;; TODO: add support for cross-compilation. - (bag - (name name) - (system system) - (build-inputs `(("meson" ,meson) - ("ninja" ,ninja) - ,@native-inputs - ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) - (host-inputs (if source - `(("source" ,source)) - '())) - (outputs outputs) - (build meson-build) - (arguments (strip-keyword-arguments private-keywords arguments))))) + `(#:meson #:ninja #:inputs #:native-inputs #:outputs + ,@(if target + '() + '(#:target)))) + + (bag + (name name) + (system system) (target target) + (build-inputs `(("meson" ,meson) + ("ninja" ,ninja) + ,@native-inputs + ,@(if target '() inputs) + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(if target + (standard-cross-packages target 'host) + '()) + ,@(standard-packages))) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@(if target inputs '()))) + ;; Keep the standard inputs of 'gnu-buid-system'. + (target-inputs (if target + (standard-cross-packages target 'target) + '())) + (outputs outputs) + (build (if target meson-cross-build meson-build)) + (arguments (strip-keyword-arguments private-keywords arguments)))) (define* (meson-build name inputs #:key @@ -161,6 +229,97 @@ has a 'meson.build' file." #:disallowed-references disallowed-references #:guile-for-build guile))) +(define* (meson-cross-build name + #:key + target + build-inputs host-inputs target-inputs + guile source + (outputs '("out")) + (configure-flags ''()) + (search-paths '()) + (native-search-paths '()) + + (build-type "debugoptimized") + (tests? #f) + (test-target "test") + (glib-or-gtk? #f) + (parallel-build? #t) + (parallel-tests? #f) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (elf-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '%standard-phases) + (system (%current-system)) + (imported-modules %meson-build-system-modules) + (modules '((guix build meson-build-system) + (guix build utils))) + allowed-references + disallowed-references) + "Cross-build SOURCE for TARGET using MESON, and with INPUTS, assuming that +SOURCE has a 'meson.build' file." + (define cross-file + (make-cross-file target)) + (define inputs + (if (null? target-inputs) + (input-tuples->gexp host-inputs) + #~(append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs)))) + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + + (define build-phases + #$(let ((phases (if (pair? phases) (sexp->gexp phases) phases))) + (if glib-or-gtk? + phases + #~(modify-phases #$phases + (delete 'glib-or-gtk-compile-schemas) + (delete 'glib-or-gtk-wrap))))) + + ;; Do not use 'with-build-variables', as there should be + ;; no reason to use %build-inputs and friends. + (meson-build #:source #+source + #:system #$system + #:outputs #$(outputs->gexp outputs) + #:inputs #$inputs + #:native-inputs #+(input-tuples->gexp build-inputs) + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:native-search-paths '#$(sexp->gexp + (map search-path-specification->sexp + native-search-paths)) + #:phases build-phases + #:configure-flags `("--cross-file" #+cross-file + ,@#$(sexp->gexp configure-flags)) + #:build-type #$build-type + #:tests? #$tests? + #:test-target #$test-target + #:parallel-build? #$parallel-build? + #:parallel-tests? #$parallel-tests? + #:validate-runpath? #$validate-runpath? + #:patch-shebangs? #$patch-shebangs? + #:strip-binaries? #$strip-binaries? + #:strip-flags #$(sexp->gexp strip-flags) + #:strip-directories #$(sexp->gexp strip-directories) + #:elf-directories #$(sexp->gexp elf-directories))))) + + (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) + system #:graft? #f))) + (gexp->derivation name builder + #:system system + #:target target + #:substitutable? substitutable? + #:allowed-references allowed-references + #:disallowed-references disallowed-references + #:guile-for-build guile))) + (define meson-build-system (build-system (name 'meson) diff --git a/guix/build/meson-configuration.scm b/guix/build/meson-configuration.scm new file mode 100644 index 0000000000..81b4eaa7e1 --- /dev/null +++ b/guix/build/meson-configuration.scm @@ -0,0 +1,71 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build meson-configuration) + #:use-module (ice-9 match) + #:export (write-section-header write-assignment + write-assignments make-machine-alist + configuration-port)) + +;; Commentary: +;; +;; Utilities for generating a ‘Cross build definition file’ for +;; the Meson build system. Configuration values are currently +;; never escaped. In practice this is unlikely to be a problem +;; in the build environment. +;; +;; Code: + +(define configuration-port + (fluid->parameter (make-unbound-fluid))) + +(define (write-section-header section-name) + "Write a section header for section named SECTION-NAME +to the configuration port." + (format (configuration-port) "[~a]~%" section-name)) + +(define (write-assignment key value) + "Write an assignment of VALUE to KEY to the configuration +port. VALUE must be a string (without any special characters +such as quotes), a boolean or an integer. Lists are currently +not supported" + (define port (configuration-port)) + (match value + ((? string?) + (format port "~a = '~a'~%" key value)) + ((? integer?) + (format port "~a = ~a~%" key value)) + (#f + (format port "~a = true~%" key)) + (#t + (format port "~a = false~%" key)))) + +(define* (write-assignments alist) + "Write the assignments in ALIST, an association list, +to the configuration port." + (for-each (match-lambda + ((key . value) + (write-assignment key value))) + alist)) + +(define* (make-machine-alist #:key system cpu-family cpu endian) + "Make an association list for the [host_machine] section." + `((system . ,system) + (cpu-family . ,cpu-family) + (cpu . ,cpu) + (endian . ,endian)))