From patchwork Sat Jun 19 15:04:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30488 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 7098327BC81; Sat, 19 Jun 2021 16:08: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,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 3335F27BC78 for ; Sat, 19 Jun 2021 16:08:46 +0100 (BST) Received: from localhost ([::1]:56536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaT-0003uw-A5 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXq-0007fU-IA for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXq-0007oD-B5 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXq-0005ct-0c for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 01/36] utils: Define target-linux? predicate. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411511121208 (code B ref 49025); Sat, 19 Jun 2021 15:06:01 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:11 +0000 Received: from localhost ([127.0.0.1]:60282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX0-0005Vc-8T for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:11 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWy-0005VF-Ay for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:09 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401357nj; Sat, 19 Jun 2021 17:05:07 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:23 +0200 Message-Id: <20210619150458.12057-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115107; bh=KuxsCFQnj4ZbArXRFEqUpWBp+xjAPFA4gW0yO+6p0Uk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TPRSHM1JZ6mBrHsAtr9VQq1jJhdBlopOej7++sF6IEANgWSdm7wwOGoBbTJPk3aCQ ByRCDOtkObmLKZqxsp5nA13RI0Q/nWgmIELgiHDgqlZagVYYVkMQGZJ1OxYc53UFUf gaLXwD92521AoW99Ytm65anNLgGvhHl3jXkc5VPFHq5YOhOCeeLG6/klJFQJRW6/Vc ZhnU9XnRd/MCmxcdTV8wV4CEF0RDLL6D2/s2FMs3cWpOy098rRNnJ46FyZHQDqEzJZ 9bbSlbpDt7TOSUkkhNm0PCvuIvzCV/Lmlc/+N3MXn2DWZfSgMy7thcuEPEQNnomRmP 3+f9WE3wsM9vw== 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 Sat Jun 19 15:04:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30468 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 8AA8527BC81; Sat, 19 Jun 2021 16:06:42 +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,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 0FF7A27BC78 for ; Sat, 19 Jun 2021 16:06:42 +0100 (BST) Received: from localhost ([::1]:50270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYT-0007mJ-57 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:06:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXr-0007hV-TF for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXr-0007q6-Lc for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXr-0005da-G9 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 02/36] 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: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411511821307 (code B ref 49025); Sat, 19 Jun 2021 15:06:03 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:18 +0000 Received: from localhost ([127.0.0.1]:60310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005Ww-2t for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:17 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWy-0005VG-Sp for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:09 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401358nw; Sat, 19 Jun 2021 17:05:08 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:24 +0200 Message-Id: <20210619150458.12057-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115108; bh=lf5YV93HuGoFIHD1h6x01QuYB2H0sCsCvf+MhMqf3Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rPcH0BNkhhX8ULDsiBMt1lC+MpODjRcM1VziATt6gL8iBV0vJ/Pk6Fb1VS54kVJ9L QUn5gmxWiLeaKV9DogEtxvB7BOfComEyCSuZ18A2VzaCIKPO7iYqavJNlCDuBZ5+7K +SaEGFPgp/4g6zuuLM82oycL6JguJUpUIbAuQu95g0tc5yAD1gjb0/i9SmY0kB9VaH DZcqt9zLA30XCp3iTvuOB+CeQlF/mrI6nwmEOYcyZNfd67GEFjA0NEVek8mfVMmVq5 +zQ2K8TdPup3BtVx92OgQ59ZvHPQjXalRZyT2Q+kcTxo/NX4O6xe991VAHE9brJHnJ QSJv7OiguqXqQ== 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 Sat Jun 19 15:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30470 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 2B99827BC78; Sat, 19 Jun 2021 16:06: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,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 73D7827BC81 for ; Sat, 19 Jun 2021 16:06:56 +0100 (BST) Received: from localhost ([::1]:51066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYh-0008TI-Dg for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:06:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXs-0007ie-Fw for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXs-0007qU-8a for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXs-0005do-3o for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 03/36] 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: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512121379 (code B ref 49025); Sat, 19 Jun 2021 15:06:04 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:21 +0000 Received: from localhost ([127.0.0.1]:60336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005Xb-MN for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWz-0005VK-Ec for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401358o5; Sat, 19 Jun 2021 17:05:08 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:25 +0200 Message-Id: <20210619150458.12057-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115108; bh=ktlZPKOFCiKBCSKOml0XVUAO70kiPtFkDzCU75II8EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rV9Gk406TswbgmJMdujKRQJwUKSXETPvEQR+ZmHlTG7YiOEGb7uug2Nw+DV6WLJTY 6uKz4fE5uld4ZmtS+6Kc3ohw0XYPr5/7XudeHRnzSHf0mLincDpPAX5Hoz/dgH7jGQ fITtsf69IYXrNxXUBzmOI7lIgCYoum7G6gfkES3tys8ih+NUA2sbJYYpnpN7Iu/coq oOQdx+lNHFIuTYEgyf92aNI4tYHy+BzPVFM6COdK1Voz0A2M5gyfGtFrKXRq43Veye hTVAqd7cdWgHDtzmdcfSbcKHHa3frm5QaSZYkJT3t0b1g++48VLYzKvZFISpgYOqXq 8vSZBrmaideYA== 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 Sat Jun 19 15:04:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30471 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 DADD627BC81; Sat, 19 Jun 2021 16:06: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,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 9DF4D27BC78 for ; Sat, 19 Jun 2021 16:06:57 +0100 (BST) Received: from localhost ([::1]:51158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYi-00006b-L1 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:06:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007ke-AC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007qy-3B for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXs-0005e3-UF for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 04/36] net-base: Make #:builder argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512221405 (code B ref 49025); Sat, 19 Jun 2021 15:06:04 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:22 +0000 Received: from localhost ([127.0.0.1]:60354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXB-0005Z4-RI for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:22 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWz-0005VF-He for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401359oB; Sat, 19 Jun 2021 17:05:09 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:26 +0200 Message-Id: <20210619150458.12057-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115109; bh=ctZm9OVHom3MpxyL0gcsO+Tj7VTiM45ESGzTs/AaDrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dqsj6kJ15LuThYohvGrPTjunFNYTew6lLkk/Peq89vThC+n/vfcGrHlg5zkoEiF7k 3abFM69UUfLeBLIuxqo2MS3tcpcQ8znLeKFtM5n5VB0Bk/DXHTX69C9F8/fsEoxKQO CiphZBEzdluZx25+KJiglaxBd987grUscr/rbaeKISOVtzgrvyioEj9i9Ex8OVnYCi LL8LqTdlp/9Eb8heJbgZvvmQxkRhA2O59LdYCOvFP8pa7XkflEp/TVxdUdsvh/5Uju Kq23r+B4r+SQDmzRgzJp3Ea4cdBVOTx2z/0E9bVhkbiO7quqgvYe9OJLqDbckeCKQe gXY6YSaRhiJTw== 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 48b9c8b893..230ba98b41 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 Sat Jun 19 15:04:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30491 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 9D61A27BC81; Sat, 19 Jun 2021 16:09:02 +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,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 60D5027BC78 for ; Sat, 19 Jun 2021 16:09:02 +0100 (BST) Received: from localhost ([::1]:57198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaj-0004N7-EM for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXs-0007jg-UM for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXs-0007qs-LU for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXs-0005dw-Gt for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 05/36] 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: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512221397 (code B ref 49025); Sat, 19 Jun 2021 15:06:04 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:22 +0000 Received: from localhost ([127.0.0.1]:60352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXA-0005Ym-Pb for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:21 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucWz-0005VD-Ue for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB401359oJ; Sat, 19 Jun 2021 17:05:09 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:27 +0200 Message-Id: <20210619150458.12057-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115109; bh=sJA6kjHnhnC1ncPAJ/dX1Nxw7NaJGy/XrvJfXqMOoLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Wx4Q2n85phhEi7R1QCnABPhX9s1pMG8mLYttrJ7Sm/vIzPVDBSXC3YCz4QcECIlKP 81kFa0gyjnMxSY9wzOO/FgCDulG9jrux90aRYseATJuYyUBYwwJsymBJfHkhchY/lH H72cIIprlj7VhQzFkY639QduTgDYeiTafHBwovxfuGsa4yV3by5g0zB7ubEfToD9R3 XxZT9pvsmw3TEC782YLEY/jIcdC8ANlhxwLbqbYInfh2ow2r5Gph5VL8JFp3cKzj4y et8kgCBW02EIsDO8lu8NLSyhJnOFopIN9BE3wzhIUK5wvIAJR/JTIQu2V9blngbCbz 2OvNzalCPYtww== 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 230ba98b41..e54be5a672 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 Sat Jun 19 15:04:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30469 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 CD00527BC81; Sat, 19 Jun 2021 16:06:43 +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,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 7FC3127BC78 for ; Sat, 19 Jun 2021 16:06:43 +0100 (BST) Received: from localhost ([::1]:50322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYU-0007oE-Hl for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:06:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007lb-My for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007r4-Fb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXt-0005eB-Bp for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 06/36] net-base: Don't cross-compile. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512221412 (code B ref 49025); Sat, 19 Jun 2021 15:06:05 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:22 +0000 Received: from localhost ([127.0.0.1]:60356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXC-0005ZC-83 for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:22 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX0-0005VG-FM for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:11 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135AoW; Sat, 19 Jun 2021 17:05:10 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:28 +0200 Message-Id: <20210619150458.12057-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115110; bh=mP/lIiqCHaKooyJufEiV8wiC6CAQNVl/Sx99B1mEkhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GSHOLpRc7aF2lIX7lcwYwnnTNdMNlBqQomEPoNut/JW8NN02CmWpETgk3zNearm5j nfhWCIQxAy6BSbTRez0957cGei/E8ygK+rkyd6HRiTD5NKDf63ER8hE5PElR5DfF2O 4fW27omfIPvzzPy5LPZon3zUA0cjK8voYeVp5qczcFkgeur1qO4dnZzGGPX3Htz/h6 GWBvlyz1DtIcN44bJJs6Y3D05BNiz/ATjiBqsg5mEaTvyNWzQwY2hHST6XcVuFfRDy +u5m9bHsF1uI4MzbppwENhkM6WJexrMA4gPaxVIIGlCXrZp4t3EWxXqZ1cdni8Mt7M IWF10VPrSyIdw== 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 e54be5a672..f8afc3d374 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 Sat Jun 19 15:04:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30493 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 ADD3127BC83; Sat, 19 Jun 2021 16:09:18 +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,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 59A7D27BC78 for ; Sat, 19 Jun 2021 16:09:18 +0100 (BST) Received: from localhost ([::1]:57888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaz-0004qq-F6 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXu-0007n9-5i for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXt-0007rC-TG for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXt-0005eI-Ob for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 07/36] tzdata: Don't bother with cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512321419 (code B ref 49025); Sat, 19 Jun 2021 15:06:05 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:23 +0000 Received: from localhost ([127.0.0.1]:60358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXC-0005ZJ-Hf for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:22 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX0-0005VD-W9 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:11 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Aod; Sat, 19 Jun 2021 17:05:10 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:29 +0200 Message-Id: <20210619150458.12057-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115110; bh=njv2jZR1vpk0wCCZRTmIX/86vA9G6pfaRGoIB44zAdM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K79HqeJ8yb/yrIk5mSGWEvEJYPwJNzmMBOcGhMUw4Ev4FPJDaSe2Ws/EXruqOEY5Z PxXVvKQCkmvD7mAcni26Fg8vnC+OSdo9PlFwfUP2LzCLv9NqS6d7IeUTvU0WPfZnfG Km8min2X51726I8x21FrJNWAVKSUBUgedWZ++oen/chyVzkgsz714DNxfL9yh20v6a b0uoDwVbhJ7cXFSfbsj/blSTbl8U4gn4gdxlnaV28iYF2jAoXN3p1nhZV0VpczC918 dZ3mfc3prBbEaOXLBTeXkdnhCZgWB2pczD4lkgQCA7P8wied0rf74874qjCOEOIdGk qQ1DRfs/5KqFg== 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 edc4c4a427..62d6822750 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. ;;; @@ -1255,6 +1256,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 Sat Jun 19 15:04:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30472 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 52C6927BC81; Sat, 19 Jun 2021 16:06:58 +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,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 04AF927BC78 for ; Sat, 19 Jun 2021 16:06:58 +0100 (BST) Received: from localhost ([::1]:51222 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYi-00008u-St for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:06:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXu-0007oA-G9 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXu-0007rp-8q for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXu-0005eP-5S for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 08/36] libgpg-error: Remove trailing #f from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512321432 (code B ref 49025); Sat, 19 Jun 2021 15:06:06 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:23 +0000 Received: from localhost ([127.0.0.1]:60360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXC-0005ZQ-Sv for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:23 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX1-0005VK-Fn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:12 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Boh; Sat, 19 Jun 2021 17:05:11 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:30 +0200 Message-Id: <20210619150458.12057-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115111; bh=UkBFl7DBKUemJe3cRqGofUDVrc8TErEYB0dd5362VyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=J7xoAVH2t4OoUj9Sw4pr5y5m0IMvwDBuQ7ZcYC9iaj45GWApOedJ0PpP0mDqrmhhd +ZLAhQg5TeDtobGPITl2pX3xRX3uvD+Due/g/RP33uXaLkD3Atu+FUFlt0sH18RsVK 3POL3/pjWpgh23ImEzmOVYv1VS36y5PE1A9MpURr4Q456iWxBX/NOdi7fyRCRRZxg4 yvFQI8NuB4KRHkcg8/w3c5vPLlGqcLLZlGikz9yP3AtxoKuuiX/B/ZmGE9noZ9nTpq 4rrBcPWVAkSgBoyxw951pu447SQsI5iwX3drVKwHDs+8yTXfAYyzqy9Ps/M2VTfxfE 2gt4HfEGRclxw== 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 Sat Jun 19 15:04:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30474 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 B0F6E27BC83; Sat, 19 Jun 2021 16:07: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,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 C4AA027BC94 for ; Sat, 19 Jun 2021 16:07:09 +0100 (BST) Received: from localhost ([::1]:52014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYu-0000k1-OA for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007qV-CW for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007si-43 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXu-0005ef-Vb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 09/36] libgpg-error: Prevent silent miscompilation some systems. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512421446 (code B ref 49025); Sat, 19 Jun 2021 15:06:06 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:24 +0000 Received: from localhost ([127.0.0.1]:60364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXD-0005Zk-Gd for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:23 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX1-0005VF-Uf for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:12 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Bom; Sat, 19 Jun 2021 17:05:11 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:31 +0200 Message-Id: <20210619150458.12057-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115111; bh=nKM9iRbL4pxeve/Z9zTlm79RMuw3U+bWD4uPyj+c1VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tpLQrTzLbWVNpxz3331dkgC0AFINZ67k5wzBMl266HSTjziNLerSg7bRf7tLAmm63 V5o68GWmORkJR+3Y+lMLupBusehrUv2D7Hka2TVtuZEphlVgemht70Z3oN5WJdDAk+ +J8XRRMscy4nTc5PaGT9FtM8S6mewNincALOQpe+8thxFE1GPf3jyiiQgLWyuHUM7x /57ZUuqNwlAnrahzxTiPyWow9IV8mPmI6zBpiVPUiyKpLBM61dWz2TjqjCZ77MjH30 aXzsk26Fw7e0pBEwFR84PPT6zTV2Y2MGuGihptYysKLgs8QxfgvuJkaweayMZ3aSCU uAeAyWceQrYWg== 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 Sat Jun 19 15:04:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30495 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 B1FD627BC83; Sat, 19 Jun 2021 16:09:27 +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,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 750EC27BC81 for ; Sat, 19 Jun 2021 16:09:27 +0100 (BST) Received: from localhost ([::1]:58314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucb8-00059E-Fr for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007oi-0V for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXu-0007sY-MO for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXu-0005eY-IG for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 10/36] libgpgerror: Maybe fix a cross-compilation bug. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512321439 (code B ref 49025); Sat, 19 Jun 2021 15:06:06 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:23 +0000 Received: from localhost ([127.0.0.1]:60362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXD-0005Za-5z for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:23 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX2-0005VG-D8 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:12 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Cov; Sat, 19 Jun 2021 17:05:12 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:32 +0200 Message-Id: <20210619150458.12057-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115112; bh=IPFgvneN7bHDKrYexwhQDz6Y7ERatBQe8mtSRZ9vaMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AokURjxE3RPDa5/rn2BL2I0yhXQpjJn8AvCcReoSGa1KmABE1khZDjH2AGofZuDHl sIhAxqAGlle1e8pzmK4Hbk6ZSaYsaMd69VhK0OBfVbTWxXbfsHSS88Q6UkQhw9mc0r AaAhkNAySFf+413gOtuvwy8Y0Fo3H30vYXNF4cfHSVKOqw+FyL+P0/FKU5MXV+U5Zw xLSswZk9knC3HzwZJCGgXnJxwdHnw56OE9B79+U++hajO2VwQ0k2K5EPYN7FzKHQRt PDEg/w35EOhC+scZtISP5RDiCQzpknkLk2XUF8OQ2QfHswVfZlD2XnyVBbvG8rP3Wc EMdGjZQsDzJZQ== 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 Sat Jun 19 15:04:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30477 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 616DB27BC78; Sat, 19 Jun 2021 16:07: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,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 CA1A027BC81 for ; Sat, 19 Jun 2021 16:07:22 +0100 (BST) Received: from localhost ([::1]:52874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZ7-0001Jj-TP for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007sZ-TW for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007tL-Ka for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXv-0005es-Go for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 11/36] libgpg-error: Fix cross-compilation error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512421454 (code B ref 49025); Sat, 19 Jun 2021 15:06:07 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:24 +0000 Received: from localhost ([127.0.0.1]:60366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXD-0005Zr-UM for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:24 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX2-0005VD-T4 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:13 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Cp3; Sat, 19 Jun 2021 17:05:12 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:33 +0200 Message-Id: <20210619150458.12057-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115112; bh=po7rDv7BdIVE5g9HkdjKKb8vIZeOm4IuDrvIrTcXbG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=l+SCvGom0qQahyyt01tnKY7RqcV1kCM4inwWjLr6q+2pnfnxqujbCkvX2PmTrb1Q7 Wo3BeiBqE5TO4b2MqdcuI68csYZ9eFx4Ml5jkBJyMgiTj2t+BO8Lef0OAM6I0OUNe9 pUpv917xYfNV8R1/MMMwUmpr0dQKoe7p0r3s9TBH7xvblcXgWzeL1hfeJNICrSb2CD OXJpPC9liCDAi6eBq9x4k8n1rk+aIwcxBSyl+v6ltTzrlLHBZ7IsxWtBhlM5Ymk519 mZGh5U+jhCPanxUu/7XsL6p9cITMx/BcyP6d6HwAnJUlOuRnb78sXGtyhNkNGWr/Kv uECsJ0BnLLrDw== 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 Sat Jun 19 15:04:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30480 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 73FD527BC78; Sat, 19 Jun 2021 16:07:58 +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,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 AC33827BC81 for ; Sat, 19 Jun 2021 16:07:57 +0100 (BST) Received: from localhost ([::1]:53706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZg-0001so-LZ for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007tq-Dl for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007tv-5K for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXw-0005f1-1G for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 12/36] libgcrypt: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512521461 (code B ref 49025); Sat, 19 Jun 2021 15:06:07 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:25 +0000 Received: from localhost ([127.0.0.1]:60368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXE-0005Zz-9T for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:24 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX3-0005VK-Cn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:13 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135DpA; Sat, 19 Jun 2021 17:05:13 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:34 +0200 Message-Id: <20210619150458.12057-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115113; bh=iyB61VxSz7o0o0YVn5/Hy/tABDE+f8iFAuqZZNSIiJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XqbG/HEtUGHjxmQ0QvLP4B4JxprTr+3WU/cz6JpC1gJRnzdtQLi5DO/yL/CGCtq0I o2pvVPDjIOuRBb+GjUICIJIwEIxlVObgK6oZrv95ZfQsylH2etZ+6C0P+FAoZyvaea pb/2npNRuFPDuZFbLBMaPw0tmc3y6ENseNSdJmPA+M4WupGa246r/7Wxn3cwYZ0kbr F5cutwjlYfcsiQy9lMclB0hXcTfhgcU3rgCN+WSgiYKFZvEJPXbIEHaHbm7wlQNydT NI8QqhEl1WYdjmyw5HqYV63mQEOWfarwmBls/wk477U2Ba8O+vY60mbTYvSzwcP57Y HWSfGNOaU/VrQ== 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 Sat Jun 19 15:04:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30483 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 304FD27BC81; Sat, 19 Jun 2021 16: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,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 ED10827BC78 for ; Sat, 19 Jun 2021 16:08:05 +0100 (BST) Received: from localhost ([::1]:54560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZp-0002Tw-1C for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007ua-R6 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007uL-J0 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXw-0005f8-Ej for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 13/36] 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: Sat, 19 Jun 2021 15:06:08 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512521467 (code B ref 49025); Sat, 19 Jun 2021 15:06:08 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:25 +0000 Received: from localhost ([127.0.0.1]:60370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXE-0005a6-Pj for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:25 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX3-0005VF-Py for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:14 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135DpL; Sat, 19 Jun 2021 17:05:13 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:35 +0200 Message-Id: <20210619150458.12057-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115113; bh=baX07FzdaFst7CwU1puNWTYenQjGwgUH3elU6tLjlKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b23xAspIwItyiYTKDW8mTglSBaYAmPVHyQ3UfDPm4Gqg7wMn4d3JcgmkY6AQUX18q UIcAXMtXTuJJ4qsQkrKJeRb3BisGYi72ME1pc9GdgOyYjGvNWI0Gqv8huFKFO+Z0YB HAPz2t6/F8A4R8/rzuXtNMV5+lCgAAlbQKcqPRPeswKvnezmEK/oUqf01Otb7eqhH6 Ijyi/19p7/bXI2Mq++Yk102KZvnQAFm/HGNu3Bg0z2OZXwxe4Wwy2jlR6OMb1/4w9Y TkSsdOnKZPkBUMm5BxeoHrKTwMHLaUiafoHoJbMbD+IxS9Li3dFwQka38in8GZ6AiA zRPROeCUs0RCA== 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 227c612a68..fe8b93b1ba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -636,29 +636,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" ,"pip3") - `("python" ,"pydoc" ,"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 Sat Jun 19 15:04:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30497 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 5EB6C27BC81; Sat, 19 Jun 2021 16:09: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,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 614ED27BC78 for ; Sat, 19 Jun 2021 16:09:44 +0100 (BST) Received: from localhost ([::1]:58820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbP-0005XW-FI for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXx-0007vh-89 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXw-0007uV-WC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXw-0005fG-S7 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 14/36] wrap-python3: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:08 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512621486 (code B ref 49025); Sat, 19 Jun 2021 15:06:08 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:26 +0000 Received: from localhost ([127.0.0.1]:60372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXF-0005aI-Cl for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:25 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX5-0005VG-Ch for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:15 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Fpr; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:36 +0200 Message-Id: <20210619150458.12057-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=ZMsN/6s+7XOcEFFTYApZei2dN0Kil09FxGyx/JO3NH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bhq7lm9lCoB2JVEKIxulMUquAaQKTv4CEOUu+1efUnj00H2udkdCPgLpETzqHn/EO dGuciIA0OYSTe4lwI5c0Id3h3ND1MCSGR38PiWtoc1B6N/g7tpXHjk9N4NV7ToC246 J1HjqJVHqBZxqoY2mpzLOEKv8yLgKbb6dhDjCU0eiW9NXbZAO7BFWtNmVwzKyAKJJj SkypBXGvDm5/1+dsqvJudCtRw9ipVNf5hYnItAXwivd2V3W77dKtX07UAeRsxJERah bxIYe6+l+uC6veHHSZSGqFRqt+QrobIMNOWLbe5jo7L58w/hmEpljKGM+qSE2KekOp GCjK/I9eSIRkQ== 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>: Eliminate %outputs and %build-inputs. --- gnu/packages/python.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fe8b93b1ba..8688104463 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. ;;; @@ -638,9 +639,9 @@ 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/"))) - (mkdir-p bin) + (let ((bin (string-append #$output "/bin")) + (python #$(file-append (this-package-input "python") "/bin/"))) + (mkdir-p bin) (for-each (lambda (old new) (symlink (string-append python old) @@ -649,8 +650,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 Sat Jun 19 15:04:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30473 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 C264E27BC81; Sat, 19 Jun 2021 16:07: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,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 8901D27BC78 for ; Sat, 19 Jun 2021 16:07:08 +0100 (BST) Received: from localhost ([::1]:51910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYt-0000eD-IH for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXx-0007wx-KL for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXx-0007ut-CC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXx-0005fN-87 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 15/36] python: Fix reference to input when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:09 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411512621492 (code B ref 49025); Sat, 19 Jun 2021 15:06:09 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:26 +0000 Received: from localhost ([127.0.0.1]:60374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXF-0005aV-V4 for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:26 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX5-0005VD-I3 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:16 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Fpx; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:37 +0200 Message-Id: <20210619150458.12057-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=S6Kz5HKekcso1/yfpL0lw+BUuLKhVWlcJ2Zv2aBaV8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q1jSViudbfYe6pfGzQAqTO80xgFeH5qwIFjSv3piQLiR1tBE95ZCwLc0WLLJvOx6L jHa2Yk9GGVg8Zw5L9xsZtJMPaSC8b+nQ4yvif9fZq1sAM2EVxItQA5cT14+1T9QsyP xbbFhh5kQz4HOLnlJFtmb5zQsdLEa3nFqCJMfNbpPMyutgJqsZpweYMzrkaddfpdaD lVZyhN6P/mg/c+t49hvPwKNrt1PbgG4LAUMsyxwsJ/s4929fe+WN+cy0kDn78ZI53b 0RWYyO1aDuhxKqbIXSsNWWVhfWQktq68s5z+g6xiU+0svLVk/mBBRtrFlnPT/sQijv ldlztdjN6cE/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 "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 8688104463..e72f888111 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 Sat Jun 19 15:04:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30485 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 B9E6B27BC81; Sat, 19 Jun 2021 16:08:21 +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,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 5C17627BC78 for ; Sat, 19 Jun 2021 16:08:21 +0100 (BST) Received: from localhost ([::1]:55242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luca4-0002yH-C2 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXy-0007yY-10 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXx-0007vR-OR for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXx-0005fU-KZ for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 16/36] openssl: Remove trailing #t from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:09 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411514821528 (code B ref 49025); Sat, 19 Jun 2021 15:06:09 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:48 +0000 Received: from localhost ([127.0.0.1]:60376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXc-0005b9-9w for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:48 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX5-0005VK-NF for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:17 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Fq0; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:38 +0200 Message-Id: <20210619150458.12057-17-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=vNDYiA0rztYMrJMcUgVtj/Lv3iazYjwdQfejEHLOE2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dMXegDftjE6/Lp+vnD2GPFEqtQOFh4OkKxC13ybgDdx0vHkBf/qN3Kvu/9hnayrep mgnbk1KIevL7H15etNlcRk9myWXbj+bF/nA0GF+qVE733NyAphe+QLFvXtyK+fkVpo YP8CqxqZdXMYqdbnk2Vd6zf4aetWWILl9GXEt5jbjPy1iPSIyq8XGlH5KtwVtO1Z9G LtM6L4+aJESBuxv4pi7FDy38rmMq1qXc9oe6BDBqQ2DTq+DBnzbPxL/68vbfAC1LN/ o/ysz7SuwMOBdK7ZeRZtxrdj1hc/row5AnrlgPaEQO/ro+ui7ygZKl9qdv9xzmvYF/ b0yGN3ixguysg== 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 31ffdb2a8a..3688449efe 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -363,8 +363,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) @@ -403,8 +402,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". @@ -417,8 +415,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) @@ -427,8 +424,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 Sat Jun 19 15:04:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30476 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 4C6FD27BC83; Sat, 19 Jun 2021 16:07: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,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 938EC27BC78 for ; Sat, 19 Jun 2021 16:07:21 +0100 (BST) Received: from localhost ([::1]:52752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZ6-0001Df-My for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXy-000807-Dc for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXy-0007vw-5W for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXy-0005fc-0v for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 17/36] openssl: Make the #:phases argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:09 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411514921536 (code B ref 49025); Sat, 19 Jun 2021 15:06:09 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:49 +0000 Received: from localhost ([127.0.0.1]:60378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXc-0005bB-Il for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:48 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX5-0005VF-Rl for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:17 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Fq5; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:39 +0200 Message-Id: <20210619150458.12057-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=Gcw+h2QCxdUe0ND+PEA3g+/inIceKw9xgBiDzndF/dA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=th0oDzkDoNSc+UZdlAdazaA/IjEBfeDSzkT31uP1D4WLi+MCdiCFbtWnOEhHpM5L/ KnwoM3C5d4oJw9j8VQluytaO2tljGRmVZxb5WyFFWgygmqRcYux3ukwP9gwRXqYJgl Rem7ksE/1FSOWMfyQfg4zhW+BNML6tNE7c7y3zo60lioDgNZZ98Pv7i5K0D0UDKUYx tC8kLkahrFcJr1UdCFgfmY8d4ylYnFpDNBBccguK/uCjoZ4y3Q/Pwf+J6Hg0PsMRRT aJx0V2RJOMORmDmryAUBjgdNdcpD95N78c7hdiml7lNnwXae4iXn3UB/NrbOKBblja Kw4ZBiIYIt2+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-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 3688449efe..f561c28251 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -39,6 +39,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) @@ -338,9 +339,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 "-")) @@ -364,7 +366,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")) @@ -374,9 +376,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" @@ -385,13 +387,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. @@ -423,7 +425,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 @@ -468,7 +470,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"))) @@ -491,9 +493,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" @@ -501,12 +503,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) @@ -531,7 +533,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 Sat Jun 19 15:04:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30487 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 5DFFB27BC81; Sat, 19 Jun 2021 16:08:35 +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,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 DB07C27BC78 for ; Sat, 19 Jun 2021 16:08:34 +0100 (BST) Received: from localhost ([::1]:56056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaH-0003YF-T9 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXz-00080E-65 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXy-0007xb-Uo for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXy-0005fq-QS for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 18/36] 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: Sat, 19 Jun 2021 15:06:10 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411515921561 (code B ref 49025); Sat, 19 Jun 2021 15:06:10 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:59 +0000 Received: from localhost ([127.0.0.1]:60382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXm-0005bZ-OU for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:59 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005Wo-B9 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:17 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135FqA; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:40 +0200 Message-Id: <20210619150458.12057-19-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=+9EUvDdijOORPjwf03KiMZvP+fUaUlaV3hprpplYCQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Or2FrLGZv0amXiKKSEMS4Db4OTpmiKyD+r1nn+MQxFCBJVjvr7u/MD54SJeVnc91q xf1t5uLSstm9VSdix8cf1JC1uGu0VJIwv4slwSuG4npCG8F3lCb32V3kapSuqmzSLh MhE9Oas/PpC6zDvj4sP9uHKq+5ylyTkrPm4FjFwnGVSRbJXUkBU+2VMzS7jjqGc1u7 7v03pWeMgm0Y/NF819vyuX2iSdmJOrLHbet5daRikT/zoPNfRS5xgXpQ+hCOFKk2V4 juO9uC5kG+9eqc9OdmRIa8hF9qR0wnmARiOh6qNUcvYjYsOY56/aUMV/ZgCPs8OkNi AOsm8gXgtu2uA== 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 f561c28251..669d33f8de 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Solene Rapenne +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -344,7 +345,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 @@ -368,8 +369,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" @@ -395,23 +396,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) @@ -420,13 +421,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 Sat Jun 19 15:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30501 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 A9B7327BC81; Sat, 19 Jun 2021 16:10:14 +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,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 789F827BC78 for ; Sat, 19 Jun 2021 16:10:14 +0100 (BST) Received: from localhost ([::1]:59908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbt-0006JQ-Gr for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081v-JD for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXz-0007yD-Bc for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXz-0005fy-74 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 19/36] 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: Sat, 19 Jun 2021 15:06:11 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411515921568 (code B ref 49025); Sat, 19 Jun 2021 15:06:11 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:59 +0000 Received: from localhost ([127.0.0.1]:60384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXn-0005bi-6E for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:59 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005Wv-Fi for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:18 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135FqE; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:41 +0200 Message-Id: <20210619150458.12057-20-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115115; bh=a8Vw/GcJ4T4qCjHX5tisuu0wU0oWUep290kHKRpnv48=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IaVZrhSgKN3icZHkpUdOCqgTtn8KFQNBLhGSm84F7+V/LG0WJmkSnv43OT/q94GCG 6hjbbuyUj0SQhAjqthAKyaIrS0lBUU4cbAL3eYMNNxrY7vB0+llZGRRNCVLyoFNAnV o2nxNoTXf3iOlxgvcEQC/cFev3eTwCLfe/yYrPjXnGrtB0f/wV005wn1J9FKemLzq7 7xcJ6zZ1h8q+vl3U0GwyfvdS1nKb58HU5/SdoiV5szNlJ1v1orVX48HWn+5PwHO3NB PQnOswRWkNrD2oyNcpeiL7tVJhz43t/dXFfbw9nL06VDltysqQqkymrNHgDrQpqFtO qwA/r5nGnK1hQ== 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 669d33f8de..4efbb4197f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -415,10 +415,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 Sat Jun 19 15:04:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30499 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 01EA727BC81; Sat, 19 Jun 2021 16:10: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,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 C62E027BC78 for ; Sat, 19 Jun 2021 16:10:05 +0100 (BST) Received: from localhost ([::1]:59430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbk-0005yj-RE for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:10:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXy-00080D-PP for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXy-0007x6-Hw for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXy-0005fj-Dp for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 20/36] 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: Sat, 19 Jun 2021 15:06:10 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411515821552 (code B ref 49025); Sat, 19 Jun 2021 15:06:10 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:58 +0000 Received: from localhost ([127.0.0.1]:60380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXc-0005bJ-Vq for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:58 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005VG-88 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:17 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135FqL; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:42 +0200 Message-Id: <20210619150458.12057-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=DPu/tlVUAJgSFitXRgPoGqHSE1UfwnoQAWQJ5vV+sdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Lnquf4H7+cUS1HNABS6Q8OTeEHnmjYw2pO5NWyu2IOLJOUceMpxLRUEQVulKMKk9p Fm4DftuJCqoDeS60w/YHlkNTclBvendZ8RieeHtCEk1XVwKV4CcTszqE+gcYHUC9q2 uBVUJ6+d0J+NAOKGrj9pjzaKMtACq4oSf2RXrntmdtHZR5NEy0jGTBRwbSztM71kd+ IRDWNPXiqwgR4MY5FXxpEyC2LhATQO3ahXVdpsLTKMUeciPaf295hvjx654s5a5Z7c bKw/ed5wSvl+TQ7nFfVOKFIKeX2/wgMm9b71XtE0S3q+NNbhFw3houC5nx2bpcyXNT 7uqMPyxF7gOWA== 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 4efbb4197f..dc9147c1e1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -408,16 +408,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 Sat Jun 19 15:04:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30490 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 DF43E27BC78; Sat, 19 Jun 2021 16:08:48 +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,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 8476B27BC81 for ; Sat, 19 Jun 2021 16:08:48 +0100 (BST) Received: from localhost ([::1]:56760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaV-000443-KD for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081q-Ha for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXz-0007yE-P6 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXz-0005g5-KY for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 21/36] openssl: Find bin/env when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:11 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411515921576 (code B ref 49025); Sat, 19 Jun 2021 15:06:11 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:59 +0000 Received: from localhost ([127.0.0.1]:60386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXn-0005bp-EI for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:59 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005X3-Ne for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:18 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135GqT; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:43 +0200 Message-Id: <20210619150458.12057-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=GsWDTNxL6QdOZSxzoRUCw21aLkpeIshumeFVrK8r6FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M+oUMmkItARtuc7EPGSuN8ErggYXWdmoD3U8pS5z6SGRUn2mmSEtaNwjVWFdEerM9 p+NXRuDoO6QgMEKOw/AcZGBLbd13gyO5wXsRkxjCe14QKXaj1nb7bdw2u/wndcE3lo rrATZ+a4GEtkQVYyT+3HhkX5wXg6RbYEmZsUgl5wlsfUFKGsLKnnCkatp7WsFw4x6U sE9BWz2CUlvA3DJq2rTsvUoVt56My1jTFrYg9VOCVLb7IsjZZ4rAowpnFA1OIPmKtp PiThY2BE/uiRouno+RwcE37R/v+4K/A6DHdqXaIC/L4OtJSU/kryxBeIvENQwcD6IM L7JSJY5FT2a5A== 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 dc9147c1e1..72a1cd8f0c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -373,10 +373,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 Sat Jun 19 15:04:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30484 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 834AE27BC81; Sat, 19 Jun 2021 16:08:20 +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,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 47B8827BC78 for ; Sat, 19 Jun 2021 16:08:20 +0100 (BST) Received: from localhost ([::1]:55184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luca3-0002vl-78 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081s-JH for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY1-0007yH-4Z for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY0-0005gR-VI for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:12 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516021590 (code B ref 49025); Sat, 19 Jun 2021 15:06:12 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:00 +0000 Received: from localhost ([127.0.0.1]:60390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXo-0005c4-0k for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:00 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005X6-SP for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:18 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqb; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:44 +0200 Message-Id: <20210619150458.12057-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=hOXFAKx0OeKrsZHlmI0Ed0p7vPPzTDwO8XFAVwi8EqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GzZjdh2wvPDs0p515j5JqIGDelC4tO5pnOF4tq9CkJpeisJIBFdc1X+FZqSsY4LsZ zCmLfeF2+sXbsFC/2N7YetuEw4BRDDffyclOjmIUrIlToEKuklbogMILzPeS8ZErpV KqxjyYy1CRaZHmb2yo9L29NwhatplCnS0o5u1NsDCm5+8cMOzJf8USln6scUd6Cv3I YWtHRMxLbLO0GUPYhwLzrbRTMRVyfFPpHrRUVYACzi7VFM2/60c/CfKLVsKLVzSGl4 Gyhv7FZzfk4d14bPwabtZT+DwCR/e0ay8Ucwi47zvIJxlDFIeCSeFcwzIW67b7CqQt k2U96rCkFG/UQ== 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 72a1cd8f0c..1ed43f0ebd 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -310,6 +310,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") @@ -348,25 +373,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 Sat Jun 19 15:04:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30498 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 A8E9A27BC81; Sat, 19 Jun 2021 16:09:52 +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,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 67C9727BC78 for ; Sat, 19 Jun 2021 16:09:52 +0100 (BST) Received: from localhost ([::1]:59100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbW-0005jc-35 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-000822-Lx for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY1-0007yI-QJ for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY1-0005gm-Mi for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 23/36] readline: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:13 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516021597 (code B ref 49025); Sat, 19 Jun 2021 15:06:13 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:00 +0000 Received: from localhost ([127.0.0.1]:60392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXo-0005cB-AR for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:00 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005X8-03 for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:19 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqf; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:45 +0200 Message-Id: <20210619150458.12057-24-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=neLQDEYrgz43VXqeDX+nDYMKaIL+ubEfobimHGhCItk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BhJ+VK2rcxo94t85XHf4dvHpgcUx0Vl6UvomVIsbPCx3XUO9/XfMq5JIsWMwF2Ib6 QPHm4f/C1D2PrSCxsTLJe1EfvNVhbnMP0FD9bqRnBpyC/rGuaM+K86kAJwO0QL6xWj gaVTzqSROd6w5/Z0AtLLKDydibL1GDUk+lJymVAqK6qcg8CTSt4g/M3+mXuxLonelk s0RkV5ep5XWjStokPkwwYna3wr24SfH7SAZQqxhdJrgXaUBEhZrl0FI/A5Q334HSPC euMY7aPnR0Sb3FffOluIpqGzT+6t2MUCQWNGKXOu47jVfJw8Nv9keHp7abJcDvL1iz owwMuC95PAqEA== 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 ced8471887..7823a4e6ad 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -31,6 +31,7 @@ #:use-module (guix git-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) @@ -78,19 +79,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 Sat Jun 19 15:04:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30475 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 5F84D27BC81; Sat, 19 Jun 2021 16:07:17 +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,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 D7D9F27BC78 for ; Sat, 19 Jun 2021 16:07:14 +0100 (BST) Received: from localhost ([::1]:52134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucYz-0000o8-Vb for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081x-L9 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY2-0007yK-JW for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY2-0005h1-F7 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 24/36] readline: Fix build error when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:14 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516121617 (code B ref 49025); Sat, 19 Jun 2021 15:06:14 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:01 +0000 Received: from localhost ([127.0.0.1]:60396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXo-0005cQ-Rv for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:01 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005XE-4x for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:19 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqj; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:46 +0200 Message-Id: <20210619150458.12057-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=tCRrS3c/vTZ0yk4aMWTAoJzvvWrPMC8M4uHWbX4RMxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H2nCx1z2SApq8Te7QGTvZxx7Tdrt9NFDHS4l4XpfTTC6IsN34jAeu/ALXEtku4UPL 4dJ1lL4vGuXQr5orIazDp0FetPRQdnh+MUyM0vKsw9L6+LClqkLYFFu2cnEsWk2o7D cydYEF/jDja3GY1MXyYm8idAaiQxFJGiCB5Q7Au/MqDiV/3ZVsAATO5Dyeyr+2YF6y ZAbidS7fnv4zjAEVNATPn+fadjjdiJMyAb/LGzNYp9scTBbFOKidbVJXfKqtT2saZ7 bK/S695hWMM5mpivik1GfPDMEXTZuE4cT0I9O0CacXSlhTRiCEDN7LpwIDa4VV9DAB pAfEgo+fFlo5w== 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 7823a4e6ad..94684702b7 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,9 +80,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 Sat Jun 19 15:04:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30481 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 5CBDE27BC81; Sat, 19 Jun 2021 16:07: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,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 2F64027BC78 for ; Sat, 19 Jun 2021 16:07:59 +0100 (BST) Received: from localhost ([::1]:53842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZi-0001yj-46 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-000821-LK for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY0-0007yG-Eb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY0-0005gK-A2 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 25/36] bash: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:12 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516021583 (code B ref 49025); Sat, 19 Jun 2021 15:06:12 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:00 +0000 Received: from localhost ([127.0.0.1]:60388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXn-0005bx-Nm for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:59 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005VD-Tn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:18 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqp; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:47 +0200 Message-Id: <20210619150458.12057-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=1zWLyKNdDiD8e2cuo2aK9D7rNa9KmEnbc2E+HBexX54=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xzr8cCIrvUYT7YqetK7obTgYyOajXZ73gR4PjQWgHZkypDLxkdwJfp+tuJWI3DNEc fbWp7tHOxAKyZo+5aFngc9v/Ip7WRYyhfLlp9L6UNDH3T8ZVL4iSzOyLT6q+xynVNc KfjMfmbzVNugsw06xP3IrsLMgEJoOYXJtkP1Tm9iBBbUN7aJAGL7rVEiEJJ+Q9Z4iz CCWmJntNN7u+ZJ1K+cCGLaVWc22w/sOSvhflLZQzGnpYwbl5uyWCJEn162M7rzWz2V 2qHVgUifQVKn38GgooB3+Zlh9YILzFPEdoWBGR5zJTwz+m6DqlQHJVClv4w1gampUw R8FypZFBqAR/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 Sat Jun 19 15:04:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30500 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 2006E27BC83; Sat, 19 Jun 2021 16:10: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,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham 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 D65A227BC81 for ; Sat, 19 Jun 2021 16:10:07 +0100 (BST) Received: from localhost ([::1]:59564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbm-000652-UL for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:10:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081t-Ik for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY3-0007yS-Hq for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY3-0005hI-DC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 26/36] bash: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:15 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516221639 (code B ref 49025); Sat, 19 Jun 2021 15:06:15 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:02 +0000 Received: from localhost ([127.0.0.1]:60400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXp-0005cl-IZ for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:01 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:33572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005XM-GZ for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4G6fH06FGlzMqnrQ for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:16 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqt; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:48 +0200 Message-Id: <20210619150458.12057-27-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=Jg15KuLDc9Pd0cjkQKGHl1QMNvmHzgPBIjg4oyLTNo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sKa08S9eayIAB1RdqqVl0WIC5eDqv97iWZOsU63uEiMOFmOfyGoOkGcYkqvKiC2dG 2cA9Co5SEID6hosKWD93jyhouYpvD5LzxGTBZ542txGPjt/tGm6eY5J/7XauVPb9oL 1yBaF58g5iAL1FHTYNPqiMFwf6nZF9SwAPpfC4UYx21Ae3yrt5NgOpdnK0IeoNmL3e NPgLYu1sfd5WU8LDmW7bojfupeihvw8ru0XoriN46QYLMnopjnSCfEzLS2OL8FnMI4 tkU9p3XDVB+25dZ+hMyDuPTGxLi/+XMiDhHKIJYuOY8Q3FHNP85P8LSLLpg0QuwJ6C KPQk41RFTMVfQ== 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 Sat Jun 19 15:04:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30494 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 08B5E27BC81; Sat, 19 Jun 2021 16:09:20 +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,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 C8E4327BC78 for ; Sat, 19 Jun 2021 16:09:19 +0100 (BST) Received: from localhost ([::1]:57980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucb0-0004uf-Sq for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081w-Jx for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY3-0007yL-4y for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY3-0005hA-0d for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 27/36] 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: Sat, 19 Jun 2021 15:06:14 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516121626 (code B ref 49025); Sat, 19 Jun 2021 15:06:14 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:01 +0000 Received: from localhost ([127.0.0.1]:60398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXp-0005cb-5j for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:01 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:60284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005XG-Co for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:19 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4G6fH108yCzMqsJ3 for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:17 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gr0; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:49 +0200 Message-Id: <20210619150458.12057-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=eE/ELwt0ayoao9TRVzPRFatyA74xUIrSYWIXnB6jcQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=r1szgjX8ne/qyYBsaugSo+J9F2ts0gbNNyO3biRNJvxqMB+CG54d35defyZ21zTuf C6q3et4s+tn0VjuCV/q/4XwL4iOKZmKdeRaFizm8MocjKU796cBmhVTwcIrkXDjp9o zKTE1dhmLyri6ODqBEIGiQ/flQinbd/2hXFg4stCxxLqPIhyxbUksh0P5tOIOGROql OJSpSlS/2y/kyfNydSEOiKIJG6uc8swCcj7jlv8MUmycTjB0BhfmFbpZ72mQcbMB65 R6hsAK1D/Z+Fehl3WJwJvr75vLumbhIJNE8A1PbNG9yjpc5IC1FbJjlbP2iOqH1YzK hn4mbkIw7WNpw== 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 Sat Jun 19 15:04:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30492 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 73FD327BC81; Sat, 19 Jun 2021 16:09: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,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 4652E27BC78 for ; Sat, 19 Jun 2021 16:09:04 +0100 (BST) Received: from localhost ([::1]:57388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucal-0004V4-Be for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081r-Il for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY2-0007yJ-6G for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY2-0005gt-2a for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 28/36] fontconfig: Fix build error when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:14 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516121605 (code B ref 49025); Sat, 19 Jun 2021 15:06:14 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:01 +0000 Received: from localhost ([127.0.0.1]:60394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXo-0005cI-K4 for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:00 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005VK-Ao for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:19 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Hr3; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:50 +0200 Message-Id: <20210619150458.12057-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=E3QkiIRS2uR7h5BsXw4b/WY2KbCrmONCKPV2ehUqpiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NpkIKXX3u8WLyR5pk7jrrOTcUkgeR9UaKB1wrvWhCq2LxXPTLOlzFDOAd5Vz0jF9N p8rsdKHYcs6LzvYqSBMt2VxZJjLJlA1EOiKo0xSYBPTlB0vEJqQZR09W21NKKdN6ZN AfcJJDLUpfDI7eRdiXxWz5uc9WRh+jh8YbVGRsKDkvH9i3jYPKVFnjnaWqGOaRF+ZS 1w0xSnvs56O4537hiIsY/Mc6uzB0blWWd5ZPAjonv8GIB/nvacHlFMgWY5u9iIHsf1 CsnVmMS6SZDxT06hJy87RcfRnBcWW3lFCHugZUWl5OVtHanTCjpdL9y9H3pHxX8biF 2e/6v46IRFFSg== 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 Sat Jun 19 15:04:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30482 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 7B51E27BC81; Sat, 19 Jun 2021 16:08:05 +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,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 3894B27BC78 for ; Sat, 19 Jun 2021 16:08:05 +0100 (BST) Received: from localhost ([::1]:54448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZo-0002P9-85 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-000824-Qc for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY5-00080G-IW for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY5-0005hs-EU for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 29/36] 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: Sat, 19 Jun 2021 15:06:17 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516721752 (code B ref 49025); Sat, 19 Jun 2021 15:06:17 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:07 +0000 Received: from localhost ([127.0.0.1]:60412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXr-0005de-He for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005VF-GW for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:23 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Hr7; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:51 +0200 Message-Id: <20210619150458.12057-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=3cyOrfR2njr5LDfDqyg6yZROWN56V/sayz4aRoA46Cw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LbCc6iLPcuqyn4LvBa2Iozi4To54V+VBW8p7rFZ1mblB6KxiEg+WWbliMFNbfjL44 /gyWhRryVlC6WaD1Hhe0TOaUZ0Q4/pwagZ0RSNz+brR4XN6i5hKwGCWrNvG71N/PTO a1AC7vZFgqqKAlB8Z1JEvqB5klDCRb5K9D3Gb1v2oWfdtiSOWhucDazKt7yH+CGY73 +nAKdLuEQdewJ1orD30Zxmv0EuYl6mekez9qn0CrKs6wXvFFEFZ2KSKOSXJNzPHOpu uPjqfHzolQGbhwPrz7fBSmlx9I6j2vbtPTZ6uL5eW1uNrWNl+4gbS9/86dgJ1BRHSD zOIHJyKD+CwGA== 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 f0be2ddaa4..4f40488df8 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. ;;; @@ -223,14 +224,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))))) @@ -293,6 +299,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 Sat Jun 19 15:04:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30479 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 8D1C627BC81; Sat, 19 Jun 2021 16:07:56 +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,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 5979027BC78 for ; Sat, 19 Jun 2021 16:07:56 +0100 (BST) Received: from localhost ([::1]:53620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZf-0001po-BV for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081z-LK for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY3-0007yl-Ui for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY3-0005hP-Pi for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 30/36] 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: Sat, 19 Jun 2021 15:06:15 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516221649 (code B ref 49025); Sat, 19 Jun 2021 15:06:15 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:02 +0000 Received: from localhost ([127.0.0.1]:60402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXq-0005cw-1L for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:02 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005VG-KX for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrD; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:52 +0200 Message-Id: <20210619150458.12057-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=vz2s9MKdv0JhQupP6/UigdW2ZfxBw8s0Jy77XHPGah0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ThIfRFPVpbW72iuGjfcXuvQCFbCmqdLQBYUp2ULaEMXn2C9VShF/3X8SrresYGgkO LYZF7SB4Riy5zvalGASb80hvX/nzWAFu9vt+yt5RhrOt3UuzW3HrZuO65q9kdNB0Fq S9o6Bx2r9GfVvivmcJ8TZ4NYge+Zgi5D+s0LO6LGjL/ejaFkPc9VS0J3o+tYv1hUgL Jho85dSIaMj8IlGAa0j9AJvBzyl9gJDEyn4NrgBlbxDY9Giuqd/NS0o6cMlGPaplEL GDVMeEk89S1awagbVD5s/egzTtz2VXed2HiBUQkw7PJvGoNUIwwWVCQnnlTtWrtsQt C+mmL/N2sDAiQ== 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 4f40488df8..22bd384fa7 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.") "static" ;static libraries "bin")) ;executables; 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 '("--default-library=both" "-Dman=true" "-Dselinux=disabled") From patchwork Sat Jun 19 15:04:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30496 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 C2CD827BCAB; Sat, 19 Jun 2021 16:09:40 +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,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 3335C27BC84 for ; Sat, 19 Jun 2021 16:09:38 +0100 (BST) Received: from localhost ([::1]:58414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbJ-0005DP-2Z for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081y-LH for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY4-0007z3-Ac for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY4-0005hW-6d for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 31/36] 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: Sat, 19 Jun 2021 15:06:16 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516321662 (code B ref 49025); Sat, 19 Jun 2021 15:06:16 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:03 +0000 Received: from localhost ([127.0.0.1]:60405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXq-0005d8-Fo for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:02 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:60288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005Xc-Vn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4G6fH14Py2zMqsJV for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:17 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrH; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:53 +0200 Message-Id: <20210619150458.12057-32-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=4s6okA0SLtxXEfxoNWtCT6YolV4q3Ygrpt5ogdXO6uU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IQ14UvL/FU4P7BddWkyq+id1SFpYkXnAOVAjGfwncZiN9Cd5jKbPvDAM3rlhyAvjd irtloZlwejMZ703d/4uboEHuW3m6+LaMv5B77SkEiqUbwBX+Q8J4wuGgt3IN745KYb QjhpbRYBhe2USGP8ICRcFd5sxaJbBbLw1aH6h/J1/5bXb5YgNf70S3M9IcrFwUFfC/ 5lDIBbo2LWO2CM/Rn5+4zP1+K0mB9b9kln+NOCupU2pyCgVw7up64xY9DVaZP8Hm/5 AqNsm2zuW5K1p2yin1hc2miW/iUrIe2flw0G7JFUaX8GnS6z2nmlCcrBCM69EuysAd 32hIpbVeYDwTw== 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 22bd384fa7..d3879879de 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -252,10 +252,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 Sat Jun 19 15:04:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30502 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 55C5F27BC81; Sat, 19 Jun 2021 16:10:17 +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,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 1C12527BC78 for ; Sat, 19 Jun 2021 16:10:17 +0100 (BST) Received: from localhost ([::1]:60084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbw-0006R0-7N for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:10:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-000820-KU for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY4-0007z5-Ni for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY4-0005he-JA for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 32/36] tk: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:16 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516321671 (code B ref 49025); Sat, 19 Jun 2021 15:06:16 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:03 +0000 Received: from localhost ([127.0.0.1]:60407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXq-0005dL-Qv for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:03 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:33576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Xh-3R for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:21 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4G6fH15FCbzMqny5 for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:17 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrN; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:54 +0200 Message-Id: <20210619150458.12057-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=5uYwnGhqcyoz8f9UYuhpumozlHAVHIx5CnK53MVgB28=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cCkIIjUbgrSY8Xdc7hzAhBO8yRArCjV2xmvlfl8n/JlOe8qUtlUymnQxuW3WVvzqL nM9oNqNNPZVrvehYiYR6AvfEZIL4Zu0FusNjYQ4Qt3/sgYeXe7UpA89MhleLTFnwBv Ket9ckhaAXUsiD41BFE/DVXc23IsihF/0idnDM3YdHLtoSdRRm77BaUh3EcA5JMNJ0 znZeWrHH+ZSHs6ZknZ/drb4qTcmo/4Xe0MGtNIqbhpxAjw17LQ5VVY3yl30PJAfgEG 616z/jY2GNgOwQTWgqs6zMz8c2lLkG1UFiYGjtiCmrgg56UbBu4Ex5/6mL6ueurWmE /691fm6a9cnIQ== 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 Sat Jun 19 15:04:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30503 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 B137E27BC81; Sat, 19 Jun 2021 16:10:21 +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,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 7849127BC78 for ; Sat, 19 Jun 2021 16:10:21 +0100 (BST) Received: from localhost ([::1]:60490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucc0-0006j7-In for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081u-JZ for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY5-0007z6-44 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY4-0005hl-WE for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 33/36] 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: Sat, 19 Jun 2021 15:06:16 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516321684 (code B ref 49025); Sat, 19 Jun 2021 15:06:16 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:03 +0000 Received: from localhost ([127.0.0.1]:60410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXr-0005dU-66 for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:03 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:33582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Xi-7g for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:21 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4G6fH1683PzMqny7 for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:17 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrS; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:55 +0200 Message-Id: <20210619150458.12057-34-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115117; bh=zt7BAM2kxTcKP2NYK6l7VYfWxdJEaUVC9x+20Op9hjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tnwL8PW7jtnxZROUzja+DuvitURIHZkbxo9IJqPJLm+oviQQw3ihAbx9KT7lF0awG b911qGpcjtOd+wueM7eviItSSwKn6NjXWDi1GsrIbCW+KhAEqkUKrt60mfi8qkew13 sICe8lrK0rkMiXen6iEB/HRiSAuooAzzO0pLXdsYHLWeyoaak91OOltK3AHore0YxE pjTmJpc7MqSk6Ltb6xEgvsze29p9ea1dBp7XsWA8Se/wSx9mDxRQbnIAkFctn8TIP0 Mp8H+eV595uNEPf9r/B5W6mxDyaD581de/GYqVUDXOm3W4UpJBG9jwjz7s5IvqAdzz 5zWWze65JezwQ== 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 Sat Jun 19 15:04:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30489 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 A30E327BC83; Sat, 19 Jun 2021 16:08:48 +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,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 1C2BC27BC78 for ; Sat, 19 Jun 2021 16:08:48 +0100 (BST) Received: from localhost ([::1]:56736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaV-00043G-4h for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY7-00082d-NT for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY6-000812-Nk for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY6-0005iE-Jb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 34/36] libelf: Use the cross-compiler when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:18 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411517321869 (code B ref 49025); Sat, 19 Jun 2021 15:06:18 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:13 +0000 Received: from localhost ([127.0.0.1]:60439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucY1-0005gV-0h for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:13 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:60294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Xr-Ez for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:31 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4G6fH205PpzMqsJd for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:18 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135HrV; Sat, 19 Jun 2021 17:05:17 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:56 +0200 Message-Id: <20210619150458.12057-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115118; bh=RWokKCzoehfrSlcLNti6dqTDx97owvOxCcB16lv8MSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AVUlWDEVfakDilOV9svovNxfI6Cz432e8fRsO+WNXO2uPFjXI6v0VfYjoWFCUTDe9 5QE6U7p/3hRLGSbs0+fDZOS0MLW9PTQwgP9jimUV470V75ktd1BWB40HHyg5VMt3bS xVpqyt940EmhegmPI2Th0cHrT2UVRfltjo5e9qE54N6K7aVFIbQp52lqIkjRgTUQ4A a8hhiOo/5rckf9ae3+bmgG9go9qmBILEAlEyO1pz3LhhF+pCp9Lm8ovu99vkZr2UQm fIBqbQsnv9Um1hp535lUi8Dnb6gtGEEGpuxO2advS+KTmuJQVGmkffASl4InoSBmMo TKT9WuO/AjDPQ== 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 Sat Jun 19 15:04:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30478 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 BE4CE27BC81; Sat, 19 Jun 2021 16:07:24 +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,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 4003827BC78 for ; Sat, 19 Jun 2021 16:07:24 +0100 (BST) Received: from localhost ([::1]:52980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZ9-0001NW-An for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY7-00082i-Pd for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY5-00080y-Uq for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY5-0005i0-R3 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 35/36] 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: Sat, 19 Jun 2021 15:06:17 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411517121839 (code B ref 49025); Sat, 19 Jun 2021 15:06:17 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:11 +0000 Received: from localhost ([127.0.0.1]:60423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXv-0005en-AI for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:11 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Wo-AW for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:25 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Jra; Sat, 19 Jun 2021 17:05:18 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:57 +0200 Message-Id: <20210619150458.12057-36-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115118; bh=9fPKxbDGsBGp3i29YCYtxFWs2CsPI2hNipZcOfdyXYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M8zcFcbECkIFno2R6il1bCZ6JpSkw9SRmsq5BylO9EVyqfUzKFTeeXHJZuCueDhYn 7aoZLD9wbn9KOV3+wS0B7X7erVJSwEU3CjZ1/RQ+pByox2LHxQkd7zvCBdSUKIO8Nr Wk3ZROXKLDM6zYsE8MoSRnEOueHhElSJnc3Wbyz9I6BLsWCmfV+Bo7oUCGyjCc6XC3 Zt2MlIdEO6GOFJn7lc/O3pICKWH6fHEFkytjOXG2t+lulxUWcDgo4Y+UAXHVKNc6ox s1kT//1+B9lTnVbt74Cyp8BGZlKoFfspwMUGiNfyjpXcdrh+pccHW0LWSJwGn9gtDq h82Nh8pccoosA== 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 926b00ccdf..b037edcc24 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 Sat Jun 19 15:04:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30486 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 D43F827BC81; Sat, 19 Jun 2021 16:08: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,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 EBCA427BC78 for ; Sat, 19 Jun 2021 16:08:33 +0100 (BST) Received: from localhost ([::1]:55956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucaG-0003To-VY for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:08:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY7-00082W-QX for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY6-000810-Ba for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY6-0005i7-7L for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 36/36] meson: Support cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:18 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411517321861 (code B ref 49025); Sat, 19 Jun 2021 15:06:18 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:13 +0000 Received: from localhost ([127.0.0.1]:60436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXz-0005gC-P3 for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:12 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX8-0005Wv-FU for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:25 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Jrh; Sat, 19 Jun 2021 17:05:18 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:58 +0200 Message-Id: <20210619150458.12057-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115118; bh=BiiiHXrcoR1o+MAtefy24iRFe0Zu5Sfgbx0xXcyG2u4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=utLGZxaz5+K6MDWOMaYq884uLXRDm2LDFfzu6z9E9DXhwcGGDqWJQivmgsPtjxCNC OmMABueV/CkoAgfsx+7ubNGP531KDZhA8nLZ7XGsgjcbfyG5RC7gZTuJcJVDLjZC7l dwqRUCCXm+kjeLTlDUebMiysTCh82HIOpAW4rN4lVNqpV0iU5QaGzjLlSr+XLxX5aI 0wiSF9hxEVIRZYPQQGUHBOrAsuH4AU0nv7m39HvS/DT3BRzfusrrLVKzJ/wOM8l1e7 WLWhPbXQ+MDMO+/TuIIEAuw67lmARW4kZeaga3Bb1hwS1Wa0qDMLb/DN9G6AIqNCd9 5PgTk9EFcJZiw== 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 f06b294f28..b9e77fd0b7 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)))