From patchwork Fri Jun 18 17:15:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30412 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 A1DB227BC78; Fri, 18 Jun 2021 18:20:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 141E427BC81 for ; Fri, 18 Jun 2021 18:20:16 +0100 (BST) Received: from localhost ([::1]:49264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAB-0007bF-53 for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:20:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luI9z-0007ab-2O for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luI9y-00046Z-Pm for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luI9y-0004rK-Fl for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 01/37] utils: Define target-linux? predicate. References: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> In-Reply-To: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403675118238 (code B ref 49025); Fri, 18 Jun 2021 17:20:02 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:11 +0000 Received: from localhost ([127.0.0.1]:57960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI98-0004jc-1b for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:11 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI95-0004j3-VO for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:08 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK5aw; Fri, 18 Jun 2021 19:19:06 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:55 +0200 Message-Id: <20210618171631.20534-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036746; bh=KuxsCFQnj4ZbArXRFEqUpWBp+xjAPFA4gW0yO+6p0Uk=; h=From:To:Cc:Subject:Date:Reply-To; b=GpbAaqGH+Fclbxs44EqQTHm5Ld8i3n1jKg30EtUOHLQ/dEX4x8UK048m33vMliLux spyom+WxIIsG+7oiGI6LAmL7Na/U5nYXaYp1yv4psUm6k+Z8sM/twkSjM6LTQru96U 7UIcz8nVF5Tuat72xkmC1zSFGxyazKGOR/c4D3Og77RDZRpAiM5PQFo7PZr5vIOIyp UFwDceg+6KhB1BC4uWYLjA/6UBCwLhiUCDoGvtwOppi4b7c6nLRqsx6U1N6R67fquj UwfxCHO7JPaUeOcaf+c2EvJBW80xIO0MGNyPx1BbzCug4hgDVZlIdwNU8gl/Moubs0 glBrmAcHn3VPw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:15:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30416 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 3B32127BC81; Fri, 18 Jun 2021 18:21:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A85DB27BC78 for ; Fri, 18 Jun 2021 18:21:14 +0100 (BST) Received: from localhost ([::1]:50012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIB7-0008Bq-PT for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA0-0007ar-7A for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luI9z-00047B-WF for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luI9z-0004rg-Ru for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 02/37] utils: Define a target-x86-32? and target-x86-64? predicate. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675618314 (code B ref 49025); Fri, 18 Jun 2021 17:20:03 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:16 +0000 Received: from localhost ([127.0.0.1]:57994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004lC-Jn for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j5-7Z for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK6b2; Fri, 18 Jun 2021 19:19:06 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:56 +0200 Message-Id: <20210618171631.20534-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036746; bh=lf5YV93HuGoFIHD1h6x01QuYB2H0sCsCvf+MhMqf3Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=n9k7sEeAp6hkSj1w0Lsr3bVGtuDnfO1pijnnZNRf/T4QHS+FcvQ+zuCJzjAjDuFJk 0WHzhAWKTVp8G+oeHcNGLHIdfcA4XyIl+ATXuzl/gyjigsgqDxyAuy2XMVSN4c3Hys UjM3H2DQJU6y55zGB04CW8NyppM7TtQ4AefQSAd001e0IwSysuhVW1kqSuM5HE65gy Mf5WbFh5WdzlSXTEpUg9+cdepIV7TI4wa/v8BBXmnNAdI4jOgzf2+tdKxgyL/vvy3I PtX8MiwwQQWySvygzhxR8/dtIaa7wYZ3/ngn4yGvcukx19MyVsjq6tlHWXvpPTEaJQ SvVR1sHdQ2nfA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:15:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30423 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 1B74C27BC83; Fri, 18 Jun 2021 18:21: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A80627BC78 for ; Fri, 18 Jun 2021 18:21:55 +0100 (BST) Received: from localhost ([::1]:51744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBm-00017f-4B for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA3-0007el-2s for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA2-00049B-Pe for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA2-0004sQ-LN for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 03/37] packages: Define this-package-input and this-package-native-input. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675918399 (code B ref 49025); Fri, 18 Jun 2021 17:20:06 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:19 +0000 Received: from localhost ([127.0.0.1]:58016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9F-0004mD-Sg for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI97-0004jA-5q for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:10 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK6b8; Fri, 18 Jun 2021 19:19:07 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:57 +0200 Message-Id: <20210618171631.20534-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036747; bh=ktlZPKOFCiKBCSKOml0XVUAO70kiPtFkDzCU75II8EQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=HQdtnEwPY+hxvSqUsiJKl6qQcGBAfG42YnXrISJlxVVDNwCyuPXrpH7fqxlCTguje yOLuN42GufJyEP3v17/axEE6NaCkUi+0heeq8HVf8xCi+wpY2GLtcwY75O4hVCBlY2 bkFxf/AGV9+X+8vBq80EyqY2y+hbusS7/qFThh/trEHz2mL1lvCcNsRGrbDQImeveJ mkM1AGmpzjOF/kd5TVPiiBp70scrAhEaZBNxm23okTDeh4AVegY39hVjATVvkbzBYW mNf9dj5DRXhSJppF4ERam7qwkHIorjpMkfV5famKX04psbtQf02ZcZkveHRAlsjGIV Puusyd42ARtYg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:15:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30411 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 64B4627BC83; Fri, 18 Jun 2021 18:20:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04EB727BC78 for ; Fri, 18 Jun 2021 18:20:16 +0100 (BST) Received: from localhost ([::1]:49266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAA-0007bO-QB for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:20:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luI9z-0007af-B6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luI9z-00046l-3d for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luI9z-0004rS-04 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 04/37] net-base: Make #:builder argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403675518305 (code B ref 49025); Fri, 18 Jun 2021 17:20:02 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:15 +0000 Received: from localhost ([127.0.0.1]:57990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004l5-6l for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j6-4C for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK7bD; Fri, 18 Jun 2021 19:19:07 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:58 +0200 Message-Id: <20210618171631.20534-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036747; bh=OUVVb2aVinBOmXNC982I6Xbat+zZCYFQMkoE2v2einI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=mrZTbfRcxqhUkapMZRlpKGSttCVSycPy7KYH2Ah64lmeUit7N48xHkHMsKeA5NWCN kXhtFQu+dev6iu4JomJRQkqwQxVA/tZz69zHSDJopPfb5AXHIcl4dbRJP7hXnPCmzp DBf7wG+VbHOa54ZmiTAMlQN19B6suR2/mz+RDLNbf+wbwFGVfJLZJbm6YnT+IBkW/z ZQ78wpOeRJ6DU5eYWS/6cWBvMtFCmde0rbDynVacdqljGYaWZWGg+FRO1cI40xOyZC oDUsueUj7UpuYX70fl3aujNC4KjHmGgebSZ20YwdGhZOivq1JW3amnAAdPzawNjYUD LPKkJsaKI8k5Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using ungexp-native and this-package-native-input later. * gnu/packages/admin.scm (net-base)[arguments]{#:builder}: Make this a G-expression. --- gnu/packages/admin.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 531686fdbb..5c7e41f51b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -74,6 +74,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autogen) @@ -936,25 +937,25 @@ to allow automatic login and starting any app.") (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) - (etc (string-append output "/etc"))) - (setenv "PATH" (string-append xz "/bin")) - (invoke (string-append tar "/bin/tar") "xvf" - source) - (chdir ,(string-append "netbase-" version)) - (mkdir-p etc) - (for-each copy-file - '("etc-services" "etc-protocols" "etc-rpc") - (map (cut string-append etc "/" <>) - '("services" "protocols" "rpc"))) - #t)))) + #:builder ,#~(begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((source (assoc-ref %build-inputs "source")) + (tar (assoc-ref %build-inputs "tar")) + (xz (assoc-ref %build-inputs "xz")) + (output (assoc-ref %outputs "out")) + (etc (string-append output "/etc"))) + (setenv "PATH" (string-append xz "/bin")) + (invoke (string-append tar "/bin/tar") "xvf" + source) + (chdir #$(string-append "netbase-" version)) + (mkdir-p etc) + (for-each copy-file + '("etc-services" "etc-protocols" "etc-rpc") + (map (cut string-append etc "/" <>) + '("services" "protocols" "rpc"))) + #t)))) (native-inputs `(("tar" ,tar) ("xz" ,xz))) (synopsis "IANA protocol, port, and RPC number assignments") From patchwork Fri Jun 18 17:15:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30413 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 0662527BC81; Fri, 18 Jun 2021 18:20: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCE4527BC78 for ; Fri, 18 Jun 2021 18:20:17 +0100 (BST) Received: from localhost ([::1]:49300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAC-0007d1-Sx for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:20:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA0-0007az-Sj for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA0-00047r-LC for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA0-0004ru-I6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675618327 (code B ref 49025); Fri, 18 Jun 2021 17:20:04 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:16 +0000 Received: from localhost ([127.0.0.1]:57998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004lL-VC for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j8-F0 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK7bG; Fri, 18 Jun 2021 19:19:07 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:59 +0200 Message-Id: <20210618171631.20534-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036747; bh=7CCAUBNV9RJ5wmDTt8PN/AU2ubDq/YhEKCtv/jZqj2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=AOtdfXIon3C9JHpOl8b8yvP1XqbbcetuvCS64AZ5U/luckKjpoeMgYcn7dnOOtGqL Pn6LEgQt0eGFRqK/UcKHJ9JrAYyCeDLWm17QIQSDo1ZWCODVpSDXrltoqA25TvoNoV Omt165w6SRePmtSS8EC/0KZSLSiLqVrSPJ9bh5oDgVpyCrPjAQ+nrH1oC7nqexjAw9 dfpPaSj+dPdLKXoHCd5b7pgFOWoxDGwOq3tC/u6Fe6mie4asjWO9H+JzxdLykIC/gA PNRRiBjMdyi3pyMrrYQviW/7yeVlgOrGhkJyplSDQsajZvFTwFGKCjl4FarTKEwNrR El8cgM5/83YTw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches "source" is not in %build-inputs when cross-compiling, so another approach for referring to the package source code is needed. * gnu/packages/admin.scm (net-base)[arguments]<#:builder>: Eliminate %build-inputs and %outputs. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5c7e41f51b..f499a1252b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -941,10 +941,10 @@ to allow automatic login and starting any app.") (use-modules (guix build utils) (srfi srfi-26)) - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) + (let* ((source #+(package-source this-package)) + (tar #+(this-package-native-input "tar")) + (xz #+(this-package-native-input "xz")) + (output #$output) (etc (string-append output "/etc"))) (setenv "PATH" (string-append xz "/bin")) (invoke (string-append tar "/bin/tar") "xvf" From patchwork Fri Jun 18 17:16:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30415 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 0AB3727BC83; Fri, 18 Jun 2021 18:21:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B501727BC81 for ; Fri, 18 Jun 2021 18:21:14 +0100 (BST) Received: from localhost ([::1]:50018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIB7-0008CB-QJ for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA1-0007be-KI for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA1-00048W-9q for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA1-0004s3-66 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 06/37] net-base: Don't cross-compile. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675718339 (code B ref 49025); Fri, 18 Jun 2021 17:20:05 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:17 +0000 Received: from localhost ([127.0.0.1]:58002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9E-0004lX-84 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j9-QJ for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK7bK; Fri, 18 Jun 2021 19:19:08 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:00 +0200 Message-Id: <20210618171631.20534-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036748; bh=xjDeyamV9yxjs2aY6I5pdFnCmGm20uQOQ9gNpihMQQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=tRq4S+0y+8rkTbNL/bKrbgKWgDyQkAct28jfVxMHKy6F4pKdpWIduiaul6aDWbPTM MFzltl4grC7rsDs6WbPB3GTaw9MIbqGwKssW1EeuSyR19qKRA0Wy1T38MK8oCioxxA Iz/betde/QfxdGRZenSRsPodvcZhv5qWpbqPc3Dsgwa9ywUAzZZ3/fCsQT1YfatsVv sX3sDCHnfRQIv4n7d+Ww5K5uWchshI4aEnhNP8sXeLFRQQX39z+F/04Rxr58XSPBcc Um3M0N31WW20nZbxBDYH657P8GG8iMEOGSoBv+8EVQCVZZ5r+wx2Z0wxU3BxJmQ5O9 uvK96gnaH848Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches net-base is pure data, so cross-compiling is pointless. * gnu/packages/admin.scm (net-base)[arguments]<#:target>: Set to #f. (net-base)[arguments]<#:allowed-references>: Disallow all references. --- gnu/packages/admin.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f499a1252b..5e41ba9967 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -937,6 +937,11 @@ to allow automatic login and starting any app.") (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) + ;; This package consists solely of architecture-independent + ;; tables. Cross-compilation is pointless! Make sure we'll + ;; always get the same derivation. + #:target #f + #:allowed-references () #:builder ,#~(begin (use-modules (guix build utils) (srfi srfi-26)) From patchwork Fri Jun 18 17:16:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30420 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 28C9B27BC81; Fri, 18 Jun 2021 18:21:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D970D27BC78 for ; Fri, 18 Jun 2021 18:21:29 +0100 (BST) Received: from localhost ([::1]:50942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBL-0000aA-9F for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA2-0007cp-AB for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA1-00048t-V7 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA1-0004sB-S6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 07/37] tzdata: Don't bother with cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675718358 (code B ref 49025); Fri, 18 Jun 2021 17:20:05 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:17 +0000 Received: from localhost ([127.0.0.1]:58006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9E-0004lj-QF for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:17 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI97-0004jB-6d for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:10 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK8bQ; Fri, 18 Jun 2021 19:19:08 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:01 +0200 Message-Id: <20210618171631.20534-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036748; bh=kOQUqdfe/b2Ix6iebNw4GykUprcUIzEM0B9Sc62yn8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=F3+7MCGbTTMLpVxRNNFtznoAscyO5czrpFw6TxARco8Jmtlolmjh4Ioz/rKYx6Nvt Yuej70Iw4N7L/MtVB2rtj0qexB/1UflDziCutQC/4dngYa5kSyqyrBbNWSovyTjub5 /3zf9nJPLa/qUhPuTnd2GmRdlVS67ZcwH/I9XJpbbWPMEFuxMPGPYPzDKfCIxyvyXN DgwCjMTLTIFsJrvrSq85XHZt6qKPjQTQygOy+B6zxmwvABvRZYEemMgL9UJ5CRCLfL VoYOqoaN0zV8hunTgTlZeMdAH3NMoKMtMKD149bPWgI05MBO69jNebn5e1RAzH3I26 MOChjkLUdmJRw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The time zone database is architecture-independent, so trying to cross-compile it is pointless! * gnu/packages/base.scm (tzdata)[arguments]<#:target>: Set to #f. (tzdata)[allowed-references]: Only include the "out" output itself, to make sure no (architecture-dependent) binaries are installed. --- gnu/packages/base.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d30299a7b6..2674be8048 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Vitaliy Shatrov ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2021 Leo Le Bouter +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1251,6 +1252,14 @@ command.") (build-system gnu-build-system) (arguments `(#:tests? #f + ;; This consists purely of (architecture-independent) data, + ;; so ‘cross-compilation’ is pointless here! + ;; (The binaries zic, dump, and tzselect are deleted in the post-install + ;; phase.) + #:target #f + ;; share/zoneinfo/posix is a symlink to share/zoneinfo, + ;; so include the package itself in #:allowed-references. + #:allowed-references ("out") #:make-flags (let ((out (assoc-ref %outputs "out")) (tmp (getenv "TMPDIR"))) (list (string-append "TOPDIR=" out) From patchwork Fri Jun 18 17:16:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30419 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 0B75027BC81; Fri, 18 Jun 2021 18:21:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C4B4327BC78 for ; Fri, 18 Jun 2021 18:21:27 +0100 (BST) Received: from localhost ([::1]:50886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBK-0000Xy-Rc for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA2-0007dZ-M6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA2-00048z-Be for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA2-0004sJ-8T for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 08/37] libgpg-error: Remove trailing #f from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675818368 (code B ref 49025); Fri, 18 Jun 2021 17:20:06 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:18 +0000 Received: from localhost ([127.0.0.1]:58012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9F-0004m1-Dq for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:17 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI97-0004j3-7N for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:10 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK8bV; Fri, 18 Jun 2021 19:19:08 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:02 +0200 Message-Id: <20210618171631.20534-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036749; bh=UkBFl7DBKUemJe3cRqGofUDVrc8TErEYB0dd5362VyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=oSMXHqyUpv7h025Dih2svR8XLsRtdwkxNatu6E0eCilWdN3sF6b/R+mxmIKxHKWLt UM4zauTt7WBNHrfH3epex5GCi0mZ5n3xGUsWNaPEUXdYc/fK3lFSjoTN5QfnWOkefn xjZFLG5YH8DdVc7MU1ZUHabkn7A0TIWo7I3dSsNWzdBmnDldwNTROQjmMdymaG5ilr tAs6JYsejCC5JA/MW2ArbSqBq8etVNy9meCTR/9LixrvRrJeInMuqsJNwHIhBB7FXb If9z3+an3G9RF0mTnBhNAvKoh1Vn3iPK4M4L4B7akcdCiG4pPdH4cvz+w2g71PHjsU 90eBSRnFIj0vQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30424 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 925D827BC78; Fri, 18 Jun 2021 18:21: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1650727BC81 for ; Fri, 18 Jun 2021 18:21:56 +0100 (BST) Received: from localhost ([::1]:51786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBn-00019G-2y for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA3-0007gY-Gz for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA3-00049i-7y for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA3-0004sY-4F for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 09/37] libgpg-error: Prevent silent miscompilation some systems. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403675918414 (code B ref 49025); Fri, 18 Jun 2021 17:20:07 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:19 +0000 Received: from localhost ([127.0.0.1]:58024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9G-0004mg-T5 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:19 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI97-0004j6-JC for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:11 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK9bd; Fri, 18 Jun 2021 19:19:09 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:03 +0200 Message-Id: <20210618171631.20534-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036749; bh=nKM9iRbL4pxeve/Z9zTlm79RMuw3U+bWD4uPyj+c1VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=bS7lOiQrb9kU0ZsoRIa/VFYzGahZuP/a6uvURHfh6mfUPzyTuh5RkkbTEzTElDjZi +CvhHbkZPXYDnAgN1VNZLupS3FiNnchNkSW4/vC4Y0GdXpCXrWGD9uMHbZTpSrnEmg uZflcUUF8kQHcx2lxWtcCEWp5GqEGELzS20XnuYaddja43MkigfgTdvkV8gkZdqDhC 4IE6hsgpR2eT07XExl1kwa1/gAxtJ2jU0mHpHoqnjoXskDKzq8TBJgB56r43wS9yeJ ++e/9j7dandJzOwz+Hc2PpX0WDXvD/y8QzM/BpSzHo3M95cxyErcr8mhgFCFwAehTX JlRQs+OfodKCQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30428 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 2054127BC81; Fri, 18 Jun 2021 18:22:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA9E127BC78 for ; Fri, 18 Jun 2021 18:22:05 +0100 (BST) Received: from localhost ([::1]:52628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBw-0001jA-R3 for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA4-0007hO-0F for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA3-0004A5-KB for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA3-0004sf-Gl for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 10/37] libgpgerror: Maybe fix a cross-compilation bug. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676018432 (code B ref 49025); Fri, 18 Jun 2021 17:20:07 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:20 +0000 Received: from localhost ([127.0.0.1]:58030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9H-0004mx-LQ for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:20 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI98-0004j5-0X for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:11 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK9bh; Fri, 18 Jun 2021 19:19:09 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:04 +0200 Message-Id: <20210618171631.20534-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036749; bh=IPFgvneN7bHDKrYexwhQDz6Y7ERatBQe8mtSRZ9vaMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=L9soqCPc/udlMZWi3kC6oP+VvcVNETiG9jTlh9lD2CiTa6olyrMxSFpAWQODbzzcF w6hpGVMaO4LyhOwPMKNsJ5AaeTkmsG1drf9WAaP9+OQI+4QbK0Kh6wtDB9WcEkQ8wF e0T4M43c/US+hBA5+oYN5GP87BVhhtl4iSYsPaWhpJao0fEQKTxtQGjkmKTcmdjEjb mFmJlbwCrcXiQSNUsj1MJqo8ubpyUPcVPFS/6upCZRFsgMBns3uLo1kTvRI/IWCQSU 8ZdaJ3o/cHHVyjzDGwP9qHxsDHCe9mXEp/PZ/oWIidFiOgOLvwHB1YMhQ0L+Vq2zbC ZBApGsIjEv3pw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30427 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 4C5BC27BC81; Fri, 18 Jun 2021 18:22: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E69927BC78 for ; Fri, 18 Jun 2021 18:22:05 +0100 (BST) Received: from localhost ([::1]:52566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBw-0001h2-4R for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA4-0007ie-Ao for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA4-0004AS-0n for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA3-0004sm-Tu for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 11/37] libgpg-error: Fix cross-compilation error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676618461 (code B ref 49025); Fri, 18 Jun 2021 17:20:07 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:26 +0000 Received: from localhost ([127.0.0.1]:58034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9I-0004nE-6G for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:26 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI98-0004j8-Ci for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:11 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK9br; Fri, 18 Jun 2021 19:19:10 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:05 +0200 Message-Id: <20210618171631.20534-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036750; bh=po7rDv7BdIVE5g9HkdjKKb8vIZeOm4IuDrvIrTcXbG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=SgOU4CjiL7upYnEQwn6AtANSUFB2+dTlHA/retKoffz2Lh6fW1jf4JTTxRwa7e6Nk E4iV3SwlsHBzZ9ZMEFVNoQU53+SWbKzczUw5AUmUtT63h4uMqpaPNImqub91nzrSip 2u45V7GsheaaN2kimEWIh68u8Zrt6L9cbmxMW8Pxgi+m6wM6lB2R/I2HvtNWF9tNsI Z/Sk2EyuB4XPusHk8lTpFd3Gkd1eEOcLbMagExr4LVyR70KZ/rl9N+El4v5RjRWhvC 1vqGW31iaa2AtHpNFc4ZeItsEMyE8+WaKUMpFJ3x81s9OolpuuqkdhbkIHqcchzZrc rcS3HN9MqlSwg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30430 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 E60FF27BC78; Fri, 18 Jun 2021 18:22:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 75E4027BC81 for ; Fri, 18 Jun 2021 18:22:10 +0100 (BST) Received: from localhost ([::1]:53052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIC1-00020k-Fc for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAB-00083R-Lj for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAB-0004Hb-BL for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAB-0004uk-8E for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 12/37] libgcrypt: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679418597 (code B ref 49025); Fri, 18 Jun 2021 17:20:15 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:54 +0000 Received: from localhost ([127.0.0.1]:58066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9q-0004pn-10 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:54 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI98-0004j9-QV for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKAby; Fri, 18 Jun 2021 19:19:10 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:06 +0200 Message-Id: <20210618171631.20534-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036750; bh=iyB61VxSz7o0o0YVn5/Hy/tABDE+f8iFAuqZZNSIiJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=gFaBHPq3I8p2jQKZ1bLtAYRso6EIeNLAxcVL8aZ4CztA2Hi+LRdU3bQ/Rql9G+SwT uRnYwBrRgLUcAx/mHhyNzG/+Z2qviCuKxwC3Dg6rFJlqslZ8f25XVstMStFcSxcGca HJS6MgaNiM+0Ow5f961dg1hgNzmWI9POrNuoFH/tYcZl6UshPDLUYgUvodL/+bOGZc S4SFOT0kAklT1mWh58wYvCR6NrInRzudChfLtVHDiShcyYej/nQZQV2DZcx7/NxZq7 Hd1Tg8wbBtNDgiLyjYc+HfN5v/8rJcrEhhnMboIfbzYv0EfP5SE2K1UWkzEaHh/IZ7 nsbQkzwQcVIwQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30445 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 CB27B27BC81; Fri, 18 Jun 2021 18:23:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E88E27BC78 for ; Fri, 18 Jun 2021 18:23:06 +0100 (BST) Received: from localhost ([::1]:56660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICv-0004Xa-Kf for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:23:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAG-0008E6-9J for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAF-0004Mr-W7 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAF-0004w3-TE for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 13/37] wrap-python3: Make #:builder a G-exp instead of a raw S-exp. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:19 +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.162403680418714 (code B ref 49025); Fri, 18 Jun 2021 17:20:19 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:20:04 +0000 Received: from localhost ([127.0.0.1]:58090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9z-0004ra-H5 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI99-0004jB-7E for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:24 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKAc6; Fri, 18 Jun 2021 19:19:10 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:07 +0200 Message-Id: <20210618171631.20534-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036750; bh=IRhMRYtA5bO8jImKpsV7nKzgOxcI4vux1/LJAwKO0vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=DWdIvE158NHud+DNXSYJJfPeUrjNheTUZhxqMNGglWqn9yoYdrhZU+FytnzAm4xFh MjzZ6BQaokkemtwN5CVtUEVFPTjtBOnxz75lM041k/Oh6HRITOjVkMfBaC0arFmM9d WQXkas7yR6zbYIeWJ8UIE54c79UuUm/hGXR65o3KzUQhNFROACun42ds4DOJGWzVtM sEd9YIt4hJ/APmD/ybu9Jxx0BsJjsgIzhoTfa2kYKDJTch5RD/2FM5OJlHw6UEt4oO P0AohuQS4UU2Nz/P1CA2vb3wmMXKj/zLIN9Gj7DJxRqNKEh7BKtcKZlpsbKsXOZq6E q+QjkoVpwFbNA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using ungexp later. * gnu/packages/python.scm (wrap-python3)<#:builder>: Make this a G-expression. --- gnu/packages/python.scm | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b2ec486d7a..9628836567 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -573,29 +573,29 @@ for more information."))) (arguments `(#:modules ((guix build utils)) #:builder - (begin - (use-modules (guix build utils)) - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) - (mkdir-p bin) - (for-each - (lambda (old new) - (symlink (string-append python old) - (string-append bin "/" new))) - `("python3" ,"pydoc3" ,"idle3" ,"pip3") - `("python" ,"pydoc" ,"idle" ,"pip")) - ;; python-config outputs search paths based upon its location, - ;; use a bash wrapper to avoid changing its outputs. - (let ((bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) - (old (string-append python "python3-config")) - (new (string-append bin "/python-config"))) - (with-output-to-file new - (lambda () - (format #t "#!~a~%" bash) - (format #t "exec \"~a\" \"$@\"~%" old) - (chmod new #o755) - #t))))))) + ,#~(begin + (use-modules (guix build utils)) + (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) + (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) + (mkdir-p bin) + (for-each + (lambda (old new) + (symlink (string-append python old) + (string-append bin "/" new))) + `("python3" ,"pydoc3" ,"idle3" ,"pip3") + `("python" ,"pydoc" ,"idle" ,"pip")) + ;; python-config outputs search paths based upon its location, + ;; use a bash wrapper to avoid changing its outputs. + (let ((bash (string-append (assoc-ref %build-inputs "bash") + "/bin/bash")) + (old (string-append python "python3-config")) + (new (string-append bin "/python-config"))) + (with-output-to-file new + (lambda () + (format #t "#!~a~%" bash) + (format #t "exec \"~a\" \"$@\"~%" old) + (chmod new #o755) + #t))))))) (synopsis "Wrapper for the Python 3 commands") (description "This package provides wrappers for the commands of Python@tie{}3.x such From patchwork Fri Jun 18 17:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30417 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 225AD27BC81; Fri, 18 Jun 2021 18:21: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9061027BC78 for ; Fri, 18 Jun 2021 18:21:16 +0100 (BST) Received: from localhost ([::1]:50142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIB9-0008JW-Ie for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA4-0007kE-Pg for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA4-0004Av-F8 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA4-0004su-Bi for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 14/37] wrap-python3: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676718468 (code B ref 49025); Fri, 18 Jun 2021 17:20:08 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:27 +0000 Received: from localhost ([127.0.0.1]:58038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9O-0004ni-H3 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:26 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI99-0004j3-HO for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:12 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKBcA; Fri, 18 Jun 2021 19:19:11 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:08 +0200 Message-Id: <20210618171631.20534-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036751; bh=uZHMNHI9o+rXnoj5Twc+b/EgkHvhpnoWxJwexV6r8Q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=XQuor4ZXse3g5cVyv9YKwrdhQybz1rSd4HOTiaN/9U5XzoSBpROrKThjadOfnEWSV QFGkNRMCxmXJOgCz2qspYWG+LbUuD1cu4cMh67um+o6aY7XqEwadH4cMN0aFu+yCi5 CeDY6bJ3JEq3qkFVaGmMwyl7QEqVXPgvdwSDzKFt3b2ivKjLcISkVyzqpdXKb0IZh+ utCbcmLnjeHfutOGtBRZ801D+RfELWQvSxho41uqzFIdxTtECwfrvWgW/LrrX+YHAn 79H6+1IvwvGusfMMljm/s9D5BdXlMZieTHi/9mStgebmQRf8qgJ37ibnH44XF9Vkqq Ig/a3vzZGAZpg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches When cross-compiling, "bash" is missing from %build-inputs, leading to a build error. Use this-package-input instead of %build-inputs to resolve this. While we're at it, eliminate all uses of %outputs and %build-inputs. * gnu/packages/python.scm (wrap-python3)[arguments]<#:builder>: Eliminte %outputs and %build-inputs. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9628836567..fbad0b65b8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Greg Hogan +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -575,8 +576,8 @@ for more information."))) #:builder ,#~(begin (use-modules (guix build utils)) - (let ((bin (string-append (assoc-ref %outputs "out") "/bin")) - (python (string-append (assoc-ref %build-inputs "python") "/bin/"))) + (let ((bin (string-append #$output "/bin")) + (python #$(file-append (this-package-input "python") "/bin/"))) (mkdir-p bin) (for-each (lambda (old new) @@ -586,8 +587,7 @@ for more information."))) `("python" ,"pydoc" ,"idle" ,"pip")) ;; python-config outputs search paths based upon its location, ;; use a bash wrapper to avoid changing its outputs. - (let ((bash (string-append (assoc-ref %build-inputs "bash") - "/bin/bash")) + (let ((bash #$(file-append (this-package-input "bash") "/bin/bash")) (old (string-append python "python3-config")) (new (string-append bin "/python-config"))) (with-output-to-file new From patchwork Fri Jun 18 17:16:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30432 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 E971927BC81; Fri, 18 Jun 2021 18:22: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A67F027BC78 for ; Fri, 18 Jun 2021 18:22:14 +0100 (BST) Received: from localhost ([::1]:53482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIC5-0002IP-Ml for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA5-0007lj-9M for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA4-0004Bk-Rh for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA4-0004t1-Od for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 15/37] python: Fix reference to input when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676718476 (code B ref 49025); Fri, 18 Jun 2021 17:20:08 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:27 +0000 Received: from localhost ([127.0.0.1]:58040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9O-0004np-SM for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:27 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI99-0004jA-UL for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:12 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKBcH; Fri, 18 Jun 2021 19:19:11 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:09 +0200 Message-Id: <20210618171631.20534-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036751; bh=PDI+BmIWM67CqaekPjoSL4qQbhEt3DyB5sTW2X9yYys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=nG9bt0Xhn9JPbPIinss13DjiPfhByLTnEG0g3qnn2PsV+VyRovtTKjRl6XRKcOzOb CrI/h9Ht5TXNYe+aIGVHycJgLrd2xjtvalcTaieHkU8XwJtpIeQTke9605eyBW+NjH flAXTye9y/eB9FrwkPXUKfr9lj0gbCr8WUtXriZa/fKdWA9UraB/bj9x/NMTuKc0Nj 3zHybZGcOmhHv/Yn4tlH51BJKf7TQAjqKU/V0o/p1mpHCLwKVW2ws7gPv8xy/2SoHW gY/U7J0uzXAubZ0hfEky6Ydv8cx58ccpo+6izlknopkCY6NJk8WbBR1Kpom8IPVs8n /hEneq0SADzmg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches "sitecustomize.py" is a native input, so look it up in 'native-inputs', not 'inputs'. * gnu/packages/python.scm (customize-site): Look up "sizecustomize.py" in 'native-inputs', not 'inputs'. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbad0b65b8..f004b8e739 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -111,13 +111,14 @@ (define* (customize-site version) "Generate a install-sitecustomize.py phase, using VERSION." - `(lambda* (#:key inputs outputs #:allow-other-keys) + `(lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (site-packages (string-append out "/lib/python" ,(version-major+minor version) "/site-packages")) - (sitecustomize.py (assoc-ref inputs "sitecustomize.py")) + (sitecustomize.py (assoc-ref (or native-inputs inputs) + "sitecustomize.py")) (dest (string-append site-packages "/sitecustomize.py"))) (mkdir-p site-packages) (copy-file sitecustomize.py dest) From patchwork Fri Jun 18 17:16:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30418 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 B315C27BC81; Fri, 18 Jun 2021 18:21: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 76B3A27BC78 for ; Fri, 18 Jun 2021 18:21:21 +0100 (BST) Received: from localhost ([::1]:50550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBE-0000JZ-HC for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA5-0007mC-G4 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA5-0004C2-7w for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA5-0004t8-4u for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 16/37] openssl: Remove trailing #t from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676718483 (code B ref 49025); Fri, 18 Jun 2021 17:20:09 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:27 +0000 Received: from localhost ([127.0.0.1]:58042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9P-0004nx-71 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:27 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9A-0004j5-A4 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:12 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKBcR; Fri, 18 Jun 2021 19:19:12 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:10 +0200 Message-Id: <20210618171631.20534-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036752; bh=s5lvIzml+iEf2MhU975NrmAtyb33WbQYhk+vg+z1dIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=PZcTStCsWgo2SEEBpJUNV0gIucAerIUifx8C4aHLIjiX7hx+/Zmvqw/HjGHPzzm5e tFYOKLW7a5oeYmjUSe+FDpFLn1bw3eMUOTf2wtL8Ozqy3NuZ1foRkei1sjiFRgAVJe /RsZIFhs2MhFfKoMmKlkOLCB37wf+uqWn/SAQquQ+NxeN7HAkvLLGvTOoHCYqMeY1T dcSSTfu7fKK7j6yFwesAVs8d7TeEtZggu5XBRzklPYbm6YXIBQ2UUiPE2czjrnSm8t mSKqxkMs06w4I3NPIIQ8PUyzfJNM4uTdBCcPA8sdvm9wUZpzX3svt5TyBHCK2SNEeB MjF2154ah59Gw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Delete trailing #t. --- gnu/packages/tls.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 608a7d05b8..5bfc5545db 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -366,8 +366,7 @@ required structures.") ((string-prefix? "powerpc64" target) "linux-ppc64") ((string-prefix? "powerpc" target) - "linux-ppc"))) - #t))) + "linux-ppc")))))) '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -406,8 +405,7 @@ required structures.") (for-each (lambda (file) (install-file file slib) (delete-file file)) - (find-files lib "\\.a$")) - #t))) + (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation (lambda* (#:key outputs #:allow-other-keys) ;; Move man3 pages and full HTML documentation to "doc". @@ -420,8 +418,7 @@ required structures.") (copy-recursively man3 man-target) (delete-file-recursively man3) (copy-recursively html html-target) - (delete-file-recursively html) - #t))) + (delete-file-recursively html)))) (add-after 'install 'remove-miscellany (lambda* (#:key outputs #:allow-other-keys) @@ -430,8 +427,7 @@ required structures.") (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" ,(package-version this-package) - "/misc")) - #t)))))) + "/misc")))))))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR") From patchwork Fri Jun 18 17:16:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30436 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 C2AF727BC81; Fri, 18 Jun 2021 18:22:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4DDE527BC78 for ; Fri, 18 Jun 2021 18:22:28 +0100 (BST) Received: from localhost ([::1]:54326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICH-0002rA-Tv for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA5-0007nz-Um for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA5-0004CH-Lo for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA5-0004tG-Hh for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 17/37] openssl: Make the #:phases argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676818490 (code B ref 49025); Fri, 18 Jun 2021 17:20:09 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:28 +0000 Received: from localhost ([127.0.0.1]:58044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9P-0004o4-GV for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:27 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9A-0004j6-L9 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:13 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKCcY; Fri, 18 Jun 2021 19:19:12 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:11 +0200 Message-Id: <20210618171631.20534-17-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036752; bh=UpZd7CWWFi0sI2W3ZGUelllQ18on6haAa/t2CC4/2tA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=eRUMxeec4//72WYuL4+aJXGQlhgyMcsD41uiH7H8a+FU0lApAcB0JJD54+LTmomn4 051J6rzkIEJkqltEEE3EifB60Ot+vvOQdAAOBMYI1//bXBcbPoIHod5Kn0G9fBbCEq ry4GO6hDg2EOIwy5uYWnRtMmx7BtHgg1yrFmP1W+K3RTeFI7fI7rl173c4uLQE/4u9 Ko0QK0fkJQJUXHzK9tWGmdYgzsReGrEcV5H1g2obwvAkjD5fWVIqdKJA6uSGPeZnGs BXsq2TMxJd7PaO9tz0qnyrZpJJNXhAQtymh3q76I7120yFwM6DQyeZORTsqKvcO195 i8NzmKCS0iR7Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using this-package-native-input later. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Make this a G-expression. (openssl-1.0)[arguments]<#:phases>: Likewise. --- gnu/packages/tls.scm | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5bfc5545db..9de9a78e84 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -38,6 +38,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -341,9 +342,10 @@ required structures.") ;; so we explicitly disallow it here. #:disallowed-references ,(list (canonical-package perl)) #:phases + ,#~ (modify-phases %standard-phases - ,@(if (%current-target-system) - '((add-before + #$@(if (%current-target-system) + #~((add-before 'configure 'set-cross-compile (lambda* (#:key target outputs #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) @@ -367,7 +369,7 @@ required structures.") "linux-ppc64") ((string-prefix? "powerpc" target) "linux-ppc")))))) - '()) + #~()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -377,9 +379,9 @@ required structures.") (("/usr/bin/env") (string-append (assoc-ref %build-inputs "coreutils") "/bin/env"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + (invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -388,13 +390,13 @@ required structures.") ;; conventional. (string-append "--openssldir=" out "/share/openssl-" - ,(package-version this-package)) + #$(package-version this-package)) (string-append "--prefix=" out) (string-append "-Wl,-rpath," lib) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + #$@(if (%current-target-system) + #~((getenv "CONFIGURE_TARGET_ARCH")) + #~()))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -426,7 +428,7 @@ required structures.") ;; scripts. Remove them to avoid retaining a reference on Perl. (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" - ,(package-version this-package) + #$(package-version this-package) "/misc")))))))) (native-search-paths (list (search-path-specification @@ -471,7 +473,7 @@ required structures.") ;; Parallel build is not supported in 1.0.x. ((#:parallel-build? _ #f) #f) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-before 'patch-source-shebangs 'patch-tests (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) @@ -494,9 +496,9 @@ required structures.") ;; Override this phase because OpenSSL 1.0 does not understand -rpath. (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + (invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -504,12 +506,12 @@ required structures.") ;; PREFIX/ssl. Change that to something more ;; conventional. (string-append "--openssldir=" out - "/share/openssl-" ,version) + "/share/openssl-" #$version) (string-append "--prefix=" out) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + #$@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (delete 'move-extra-documentation) (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys) @@ -534,7 +536,7 @@ required structures.") ;; scripts. Remove them to avoid retaining a reference on Perl. (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) + #$version "/misc")) #t))))))))) (define-public libressl From patchwork Fri Jun 18 17:16:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30414 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 3974D27BC81; Fri, 18 Jun 2021 18:20:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5993927BC78 for ; Fri, 18 Jun 2021 18:20:56 +0100 (BST) Received: from localhost ([::1]:49650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAp-0007tj-4s for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:20:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA6-0007pl-Hc for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA6-0004Cj-57 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA6-0004tO-1P for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 18/37] openssl: Use G-exp machinery for referring to outputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676818498 (code B ref 49025); Fri, 18 Jun 2021 17:20:09 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:28 +0000 Received: from localhost ([127.0.0.1]:58046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9P-0004oB-V0 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:28 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9B-0004j8-2r for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:13 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKCcl; Fri, 18 Jun 2021 19:19:12 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:12 +0200 Message-Id: <20210618171631.20534-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036752; bh=YhqcZofahoNOOGEzlc59JaojMMV5QRbpQX/W3AtKzII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=jIehDTMQTpTzukeWkgC//KPla3LnoInPDFfBlnZNrF7DWXC2+oAtr0GjWyxypxiAa hUPQRvJO8mp4pX+CFKJ5pKhYMDPcdn1PlIpWLupzAFWPGtt3sqPXZph/TbE1reUa2a yZruSYSeowxnAXxg9YbTFxg3Mw6p0fz2wSefC3speTT5Fsrrli4F+fhxcvsvVOOzle 4EHDD0X7dctKNtRgomQFzAAM4DdIX7uHSFZwZz5NZBolcNJbczPFInqOkswoJtaVIL 0s2b/Sc1fgHo14hAaa2tBLkgFxILWRSRjbVHl+BbbgHKhHi8NEDE03sdCn4nR5a1Jx gyfNSiRQCmoMQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This doesn't fix anything broken, just for simplifying the code a little while we're rebuilding the world anyway. IMHO this makes the code a little more readable. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Don't refer to the association list 'outputs', use #$output, #$output:doc and #$output:static instead. --- gnu/packages/tls.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9de9a78e84..90211c733d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -347,7 +348,7 @@ required structures.") #$@(if (%current-target-system) #~((add-before 'configure 'set-cross-compile - (lambda* (#:key target outputs #:allow-other-keys) + (lambda* (#:key target #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" (cond @@ -371,8 +372,8 @@ required structures.") "linux-ppc")))))) #~()) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (lambda _ + (let* ((out #$output) (lib (string-append out "/lib"))) ;; It's not a shebang so patch-source-shebangs misses it. (substitute* "config" @@ -398,23 +399,23 @@ required structures.") #~((getenv "CONFIGURE_TARGET_ARCH")) #~()))))) (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Move static libraries to the "static" output. - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (lib (string-append out "/lib")) - (static (assoc-ref outputs "static")) + (static #$output:static) (slib (string-append static "/lib"))) (for-each (lambda (file) (install-file file slib) (delete-file file)) (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Move man3 pages and full HTML documentation to "doc". - (let* ((out (assoc-ref outputs "out")) + (let* ((out #$output) (man3 (string-append out "/share/man/man3")) (html (string-append out "/share/doc/openssl")) - (doc (assoc-ref outputs "doc")) + (doc #$output:doc) (man-target (string-append doc "/share/man/man3")) (html-target (string-append doc "/share/doc/openssl"))) (copy-recursively man3 man-target) @@ -423,13 +424,12 @@ required structures.") (delete-file-recursively html)))) (add-after 'install 'remove-miscellany - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; The 'misc' directory contains random undocumented shell and Perl ;; scripts. Remove them to avoid retaining a reference on Perl. - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/share/openssl-" - #$(package-version this-package) - "/misc")))))))) + (delete-file-recursively (string-append #$output "/share/openssl-" + #$(package-version this-package) + "/misc"))))))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR") From patchwork Fri Jun 18 17:16:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30421 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 5365B27BC81; Fri, 18 Jun 2021 18:21:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1333527BC78 for ; Fri, 18 Jun 2021 18:21:34 +0100 (BST) Received: from localhost ([::1]:51010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBR-0000d5-3f for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA7-0007re-6G for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA6-0004DV-SJ for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA6-0004tb-PE for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 19/37] openssl: Move documentation instead of copying and deleting it. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676818505 (code B ref 49025); Fri, 18 Jun 2021 17:20:10 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:28 +0000 Received: from localhost ([127.0.0.1]:58048 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9Q-0004oJ-B1 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:28 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9B-0004j3-FA for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:13 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKCct; Fri, 18 Jun 2021 19:19:13 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:13 +0200 Message-Id: <20210618171631.20534-19-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036753; bh=tccV5/cHu439jXtpaZe5XLAOFrBmvilcUPK5tJbOj6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Sh6gUxCr+ksqGe5bKQpNtHJ+ckFkAsVvQ3r9zyJZ0XnSyzleDVLQxHF5f8w8l9rDk 4ywS8/c8LNTbAv7ZOPRMvPuy9jSCo9FBmL4xthPOE+TmNU0Ovf+dTyrqjN+LMHSoQL kqQf+iFulsg+lLQW4EtAmA2Lb+0Q4Ztnm8X68X/+5qwDuj9QH92gOOtKqfaavsWeAt Jc02NQ5ZxKDv5ulOUkRX3UbT++qkj3TIXFWqmIB/dv9HAWKVDbWTEs5mpo10Od39AI +Kf46ezki7HmKSllaGwstrNhnbK60xRyh1q9YBtXtICLeNbbvCBEnlJ5xShLuDpDLN TekiA2443efFA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (openssl)[arguments]<#:phases>{move-extra-documentation}: Use 'rename-file' instead of 'copy-recursively' and 'delete-file-recursively'. --- gnu/packages/tls.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 90211c733d..9aa0b5a212 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -418,10 +418,10 @@ required structures.") (doc #$output:doc) (man-target (string-append doc "/share/man/man3")) (html-target (string-append doc "/share/doc/openssl"))) - (copy-recursively man3 man-target) - (delete-file-recursively man3) - (copy-recursively html html-target) - (delete-file-recursively html)))) + (mkdir-p (dirname man3-target)) + (mkdir-p (dirname html-target)) + (rename-file man3 man-target) + (rename-file html html-target)))) (add-after 'install 'remove-miscellany (lambda _ From patchwork Fri Jun 18 17:16:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30431 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 9C28227BC81; Fri, 18 Jun 2021 18:22: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6639927BC78 for ; Fri, 18 Jun 2021 18:22:14 +0100 (BST) Received: from localhost ([::1]:53436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIC5-0002H1-Fr for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA7-0007su-JS for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA7-0004Dw-9r for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA7-0004ti-5s for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 20/37] openssl: Move all man pages to separate output, not only man3. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676918512 (code B ref 49025); Fri, 18 Jun 2021 17:20:11 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:29 +0000 Received: from localhost ([127.0.0.1]:58050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9Q-0004oQ-KI for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:28 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9B-0004jA-SQ for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:14 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKDcy; Fri, 18 Jun 2021 19:19:13 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:14 +0200 Message-Id: <20210618171631.20534-20-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036753; bh=N8OeVKJpboHCfJBxETy5Vb0auS0E6suYXS8mlWbYOmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Wt6VdHDaGGPt4t0TYac+V5Qaap+RlequO5VBpHcE0dXngU4iXTAoLZNBKkhuZxbPQ aErm2fGrrKYkXEd/n29eV41raSmpcPDcaR85XLl8URa3TI1j7YcvtXvhgtm2mKRqh2 StbTJER7vAw8xNkYH/G69b9Pb+vQZVxIAZB799HBUdSpd8U42kFA/rB2cbCpRLsP9k XgSiOswWGK1ltZ6Lcfp12kzObW6jfT/ddEEwdWrggbVjxQaPCaskRYakc80OibzU23 exnM199/HeGzbMx+M0jN0pgBPid7IX5xzQzOsMK01dZMAN97fOvHygiFDc+urUMF40 VEzFqnXfXtrSg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches There does not seem to be any reason to only move man3 pages. So, move all man pages to a separate output for documentation. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>{move-extra-documentation}: Move all man pages, not only man3. --- gnu/packages/tls.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 9aa0b5a212..c178806805 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -411,16 +411,16 @@ required structures.") (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation (lambda _ - ;; Move man3 pages and full HTML documentation to "doc". + ;; Move man pages and full HTML documentation to "doc". (let* ((out #$output) - (man3 (string-append out "/share/man/man3")) - (html (string-append out "/share/doc/openssl")) + (man (string-append out "/share/man")) + (html (string-append out "/share/doc/openssl")) (doc #$output:doc) - (man-target (string-append doc "/share/man/man3")) + (man-target (string-append doc "/share/man")) (html-target (string-append doc "/share/doc/openssl"))) - (mkdir-p (dirname man3-target)) + (mkdir-p (dirname man-target)) (mkdir-p (dirname html-target)) - (rename-file man3 man-target) + (rename-file man man-target) (rename-file html html-target)))) (add-after 'install 'remove-miscellany From patchwork Fri Jun 18 17:16:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30422 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 E9BC727BC81; Fri, 18 Jun 2021 18:21: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9605F27BC78 for ; Fri, 18 Jun 2021 18:21:43 +0100 (BST) Received: from localhost ([::1]:51376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBa-0000ri-9M for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA8-0007tI-6B for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA7-0004EQ-RC for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA7-0004ts-Me for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 21/37] openssl: Find bin/env when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676918520 (code B ref 49025); Fri, 18 Jun 2021 17:20:11 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:29 +0000 Received: from localhost ([127.0.0.1]:58052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9Q-0004oX-TT for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9C-0004j5-9e for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:14 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKDd3; Fri, 18 Jun 2021 19:19:14 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:15 +0200 Message-Id: <20210618171631.20534-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036754; bh=vhZXOsCczCO429r2Yoc9TLnkfRn6IvuUP6kheXL3cLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=fEsAQGTTL0ENKW1HHYcd0DK4vANAKzYWbABBLwUwvrKYSLh66uR4zTQ0AWyZ1QHN1 nBSN9dF5hB8CNr2g8e7zC034rpV4AINEo4zsYi60Donrxl26PDJvID9BgYzZH0VRSE pG2ThQXXcGuCbAAXgpupGmgPt4YJHiBobOTO6mu7aWkbb3uR4Xuo28yoqad8i0/gnP UV9XjOMd2cAdFF9LLVfkk/nNy1QGkKYX3uOTPXFFTjQRhiX19TA0hoO/xddxiscILQ H8e0SvtTnIDIsQGqL8uwK6fF4GaUR5wsxuwasEx8SVUhREeZlayoE2KEnZJiK+wLPX HotXRDUK7A5aA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so find bin/env by another way. * (openssl)[arguments]<#:phases>{configure}: Don't use '%build-inputs', use 'which' instead. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c178806805..a4e754e27f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -376,10 +376,10 @@ required structures.") (let* ((out #$output) (lib (string-append out "/lib"))) ;; It's not a shebang so patch-source-shebangs misses it. + ;; Don't use (assoc-ref %build-inputs "coreutils"), as + ;; %build-inputs is not defined when cross-compiling. (substitute* "config" - (("/usr/bin/env") - (string-append (assoc-ref %build-inputs "coreutils") - "/bin/env"))) + (("/usr/bin/env") (which "env"))) (invoke #$@(if (%current-target-system) #~("./Configure") #~("./config")) From patchwork Fri Jun 18 17:16:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30426 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 587FF27BC81; Fri, 18 Jun 2021 18:22:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2438227BC78 for ; Fri, 18 Jun 2021 18:22:01 +0100 (BST) Received: from localhost ([::1]:52214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBs-0001Sl-6a for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA8-0007uS-Jk for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA8-0004Er-A9 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA8-0004tz-6u for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676918527 (code B ref 49025); Fri, 18 Jun 2021 17:20:12 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:29 +0000 Received: from localhost ([127.0.0.1]:58054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9R-0004of-6d for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9C-0004j6-L3 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:14 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKEd7; Fri, 18 Jun 2021 19:19:14 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:16 +0200 Message-Id: <20210618171631.20534-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036754; bh=1ERsHqWnvtyigwuip0m1eh/IFO2MV3pns4YrtQZDDxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=if50NeI/txYRuZwDepx2buANmcBU0PnqoMgwKJ9TblhYnvIpMXhdCrNnzdol68E6J ZwOLMuzEGUmO1/XlxZwoI5pdML9wk0hHdDjfNduGFFWt3QyCGl/ejqm6pyNoMVmkCE aoiOdndIy8v7aEhbyIkOLXg1e4ZjAsBAm7ANOUGkotPa9Xpyb01F0NWQv0QlN6SWXe HkmOtbssVE99hfsshJ1FNQbAyh/y6e4c/U7BmWFJRRCWHZPHHemM6ZQ7opcMxti/Bl 0goOHo2MFBrixIIytTlzKZCRMVwdIE/9KS4+EVP3v+TpED4S2OjOzBDoJ2bAcA8etS zHubEJsSqvCkg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches By computing this value outside the build code, new targets can be added without causing rebuilds for other targets. * gnu/packages/tls.scm (target->openssl-target): New procedure. (openssl)[arguments]<#:phases>{set-cross-compile}: Use it. --- gnu/packages/tls.scm | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a4e754e27f..af91e42888 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -313,6 +313,31 @@ required structures.") (define-public guile3.0-gnutls (deprecated-package "guile3.0-gnutls" gnutls)) +(define (target->openssl-target target) + "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling +OpenSSL for TARGET." + ;; Keep this code outside the build code, + ;; such that new targets can be added + ;; without causing rebuilds for other targets. + (cond ((string-prefix? "i586" target) + "hurd-x86") + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "mips64el" target) + "linux-mips64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64") + ((string-prefix? "powerpc64le" target) + "linux-ppc64le") + ((string-prefix? "powerpc64" target) + "linux-ppc64") + ((string-prefix? "powerpc" target) + "linux-ppc"))) + (define-public openssl (package (name "openssl") @@ -351,25 +376,8 @@ required structures.") (lambda* (#:key target #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" - (cond - ((string-prefix? "i586" target) - "hurd-x86") - ((string-prefix? "i686" target) - "linux-x86") - ((string-prefix? "x86_64" target) - "linux-x86_64") - ((string-prefix? "mips64el" target) - "linux-mips64") - ((string-prefix? "arm" target) - "linux-armv4") - ((string-prefix? "aarch64" target) - "linux-aarch64") - ((string-prefix? "powerpc64le" target) - "linux-ppc64le") - ((string-prefix? "powerpc64" target) - "linux-ppc64") - ((string-prefix? "powerpc" target) - "linux-ppc")))))) + #$(target->openssl-target + (%current-target-system)))))) #~()) (replace 'configure (lambda _ From patchwork Fri Jun 18 17:16:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30435 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 C470B27BC81; Fri, 18 Jun 2021 18:22:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9692B27BC78 for ; Fri, 18 Jun 2021 18:22:26 +0100 (BST) Received: from localhost ([::1]:54302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICH-0002qP-Kh for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA8-0007vR-VH for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA8-0004FJ-NK for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA8-0004u6-K4 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 23/37] readline: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403676918533 (code B ref 49025); Fri, 18 Jun 2021 17:20:12 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:29 +0000 Received: from localhost ([127.0.0.1]:58056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9R-0004om-IJ for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004j8-0J for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:15 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKEdH; Fri, 18 Jun 2021 19:19:14 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:17 +0200 Message-Id: <20210618171631.20534-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036754; bh=6pKRGWeWOQaDnklxh6edH5vqNzGDBgspCLih5AvELa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=SAhVB4+Acsuptw6fthKwMeM4ZRFrXgKOeeDudKF/C76z1WtcOMVlxt9A/5nG6TK6n 2pwVPTXZiP+FGqZsdlf8gCiTH/HXbWETmuLI+5TaalMNEEsQ7AnLUJoJZHo2Z30SLo mPjSNRbfy5PfdK5pw7+4p2dpXnI3b3UwvjxSzPr6su8IXsD3cr8QLSu1z1j1rXhV1x 99twNMmK/Nyi0ssPW+x9w9NcJtQJawW7ypHephgc3sv8V+RyhkDEPsh9b3sT8ZCihm SANE+NuguFfdT5MAgC9yV+Zn1xKws2ZITpWRbItQBlS5VrUzwwJCjGwpbtZ/LmaEuG lN2lUthZ2Uf3Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allos using ungexp and this-package-input later. * gnu/packages/readline.scm (readline)[arguments]<#:configure-flags>: Make this a G-expression. --- gnu/packages/readline.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index b4c91675a4..6cfa24c666 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (ice-9 format)) (define (patch-url version seqno) @@ -76,19 +77,19 @@ (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) (arguments `(#:configure-flags - (list (string-append "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib") + ,#~(list (string-append "LDFLAGS=-Wl,-rpath -Wl," + (assoc-ref %build-inputs "ncurses") + "/lib") - ;; This test does an 'AC_TRY_RUN', which aborts when - ;; cross-compiling, so provide the correct answer. - ,@(if (%current-target-system) - '("bash_cv_wcwidth_broken=no") - '()) - ;; MinGW: ncurses provides the termcap api. - ,@(if (target-mingw?) - '("bash_cv_termcap_lib=ncurses") - '())) + ;; This test does an 'AC_TRY_RUN', which aborts when + ;; cross-compiling, so provide the correct answer. + #$@(if (%current-target-system) + '("bash_cv_wcwidth_broken=no") + '()) + ;; MinGW: ncurses provides the termcap api. + #$@(if (target-mingw?) + '("bash_cv_termcap_lib=ncurses") + '())) ,@(if (target-mingw?) ;; MinGW: termcap in ncurses From patchwork Fri Jun 18 17:16:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30446 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 2DF2027BC81; Fri, 18 Jun 2021 18:23:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA6D327BC78 for ; Fri, 18 Jun 2021 18:23:11 +0100 (BST) Received: from localhost ([::1]:57022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luID1-0004mg-1F for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:23:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAC-00086D-Cp for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAC-0004IF-3l for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAC-0004uy-0e for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 24/37] readline: Fix build error when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679518612 (code B ref 49025); Fri, 18 Jun 2021 17:20:15 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:55 +0000 Received: from localhost ([127.0.0.1]:58070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9q-0004q1-MB for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:54 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004j3-CI for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKEdQ; Fri, 18 Jun 2021 19:19:15 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:18 +0200 Message-Id: <20210618171631.20534-24-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036755; bh=OE2XkfDDREhGi22ahelmmYnT5woDpIc1bL8b6o9Sgmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=IjAROuzS3E2u+SO0u5xYkPWijmborInq+HQY+D9hM476PYlQS+HNCzwqv2++gHqfA VyVjCvWSFl8GgDj86yWiLpe/1nUrEMC3h89h//UUqi0LhfPyjyyt6geqjH8SV9UgpR afugn/y40wzIHi2YeGUuPa73BY1aHUPlfr/gC6J/SCYxj+h/RLajyxIZ6pvMO2r2qw oTR3y/C5IxZG42ixtkrvoFYNA6wf23EfAcdYq+Bcn3+1YqHTbsTBs1kClBu3IqACdy GcO+nixaMWDLiKy/dKnh+/Ulo5ETJ/hO5/dBh7VGlNEoMI/z632/GgeOMaJmP9J5tv OKXcxelJnjFTw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches %build-inputs does not exist when cross-compiling, so use this-package-input instead. * gnu/packages/readline.scm (readline)[arguments]<#:configure-flags>: Use this-package-input instead of %build-inputs. --- gnu/packages/readline.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 6cfa24c666..f9f2797247 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,9 +78,10 @@ (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) (arguments `(#:configure-flags - ,#~(list (string-append "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib") + ,#~(list (string-append + "LDFLAGS=-Wl,-rpath -Wl," + #$(this-package-input "ncurses") + "/lib") ;; This test does an 'AC_TRY_RUN', which aborts when ;; cross-compiling, so provide the correct answer. From patchwork Fri Jun 18 17:16:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30441 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 5C8A827BC84; Fri, 18 Jun 2021 18:22:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 06BE227BC81 for ; Fri, 18 Jun 2021 18:22:53 +0100 (BST) Received: from localhost ([::1]:55942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICi-00040G-2N for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAC-00084q-0Z for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAB-0004I8-Nq for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAB-0004ur-KC for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 25/37] bash: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679418604 (code B ref 49025); Fri, 18 Jun 2021 17:20:15 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:54 +0000 Received: from localhost ([127.0.0.1]:58068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9q-0004pu-BD for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:54 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004jA-NU for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKFdT; Fri, 18 Jun 2021 19:19:15 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:19 +0200 Message-Id: <20210618171631.20534-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036755; bh=1zWLyKNdDiD8e2cuo2aK9D7rNa9KmEnbc2E+HBexX54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=FQ1dtlRnitZ4MloYmgv95nUI60F5h1KuKbxv3qwynD9V9qiAB6+np8dd8cVGUGTqT cru/9jEbCv4SYIsIYj7+kyxebSTQAfcI9FbUWpmKLuGMDn6ye6CggcAFnrFKgm9/hQ nnBzpZSlNsXoyuveF/1KzQdX6N4wtJAtYt4BjF0dErvq7fMDml//KAGDbllWOBvcOK UE6wxyrW+CpbJxULtfcofBqYgjcpUiF6ECnoV5s1u17XruQCuFSqDKIXErWPfZvQ9a Lm723erwXfUqt5XwuSaZsbcpo6G+p5yvLrE3EUz5xjELHf0zotckUD34E6WeqK1Wb3 RzHTaisbdTiyQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30425 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 DC6D627BC81; Fri, 18 Jun 2021 18:21:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A3C5E27BC78 for ; Fri, 18 Jun 2021 18:21:57 +0100 (BST) Received: from localhost ([::1]:51882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBo-0001DC-ME for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:21:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA9-0007wq-FN for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA9-0004FQ-4f for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA9-0004uE-0w for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 26/37] bash: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679318568 (code B ref 49025); Fri, 18 Jun 2021 17:20:12 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:53 +0000 Received: from localhost ([127.0.0.1]:58058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9o-0004pP-U7 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:53 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9E-0004j5-45 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKFdY; Fri, 18 Jun 2021 19:19:15 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:20 +0200 Message-Id: <20210618171631.20534-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036755; bh=Jg15KuLDc9Pd0cjkQKGHl1QMNvmHzgPBIjg4oyLTNo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Whafk8vV5dybHyvXIYDi88xGSYYJVao/QasbAnTi8xRqr9z7Aj5kDP+ZYgNagO8e/ 2M9tMf08wd78Y8wvdoon1wvMO8nWQ0700Szhqo37qvF0zxzLMYnYFh8ms8/B1StJmL QpX58wrmBrj0hB5Nlgd7rdqq2eM5ciKYBK0RjUMHDfn4SkuVNjF+QyeJpI6ejCtZjq rin3du9+H1YkuCE1KS74/RN9QDM0XyXoZFWa9WwjcibXKFmuDA58cWTTpmfSLmr9XX 5h9z754/w6FJaqyun2DlUoW+QcV03qzYGSkgkuukUKMqExfwqKhajKozDYDD0E+MEO +qLB31B3WihVQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30438 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 0D64427BC81; Fri, 18 Jun 2021 18:22: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE21627BC78 for ; Fri, 18 Jun 2021 18:22:42 +0100 (BST) Received: from localhost ([::1]:55144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICX-0003Pq-Pp for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA9-0007xf-Rx for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA9-0004Fs-Iy for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA9-0004uM-F8 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 27/37] fontconfig: Make the #:configure-flags argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679318575 (code B ref 49025); Fri, 18 Jun 2021 17:20:13 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:53 +0000 Received: from localhost ([127.0.0.1]:58060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9p-0004pR-67 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:53 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9E-0004j6-FU for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKFdf; Fri, 18 Jun 2021 19:19:16 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:21 +0200 Message-Id: <20210618171631.20534-27-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036756; bh=eE/ELwt0ayoao9TRVzPRFatyA74xUIrSYWIXnB6jcQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=lHSk6Dit8aMezQn+xFQ9mieSdsccj9STBmM1dZlep8jOyYR0ivL4H/RZIGC2TmJtx WeUsInttPipZzM+UpS1zdL+TeAI3EA2iDCCV+xmbLbLIiE9dqRzbyqyok1Jr3ldx6x HFpEqNf/tJg0y7Pf7RZFT++rk6DXn1rE5aQvUhk7xnIcA98/SR/IM60xwxWydA/C/S MzwD1Fy0JNRXtv3YbPv9RTuLHedtEC2+cGHbdTdIhxwY08G5gnqcmUAewVZHLLJ/MZ j2RAo17xoD7AhdPz4j8Z2x6GJRGZwU6yulBKLw1G2Q95T0JnKzGxE/Z3Z9aHO9YG6n 5+ISCcVANZX5Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30439 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 5248227BC81; Fri, 18 Jun 2021 18:22: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2AF4727BC78 for ; Fri, 18 Jun 2021 18:22:43 +0100 (BST) Received: from localhost ([::1]:55184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICY-0003R4-6e for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAA-0007zO-F0 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAA-0004GX-6s for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAA-0004uV-31 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 28/37] fontconfig: Fix build error when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679318583 (code B ref 49025); Fri, 18 Jun 2021 17:20:14 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:53 +0000 Received: from localhost ([127.0.0.1]:58062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9p-0004pY-FL for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:53 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9E-0004j8-Rl for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:17 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKGdj; Fri, 18 Jun 2021 19:19:16 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:22 +0200 Message-Id: <20210618171631.20534-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036756; bh=E3QkiIRS2uR7h5BsXw4b/WY2KbCrmONCKPV2ehUqpiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Pj7L9tTijh7yo3hOwIaODsPF2ihG7M08t5tu0hcyAqT6FWCa+3YtfyRk/qkaCwtZH pZ21JD7s1SOjNSChlmIyLlKfPRN25R5e9ZszHLXbI5tonHAqnou3IymT257eUXjaPa nSfRQQfP1+YYdnIdfjd2wFlFPKPNqynDC4jacHP4NJFGtijWPYu22mIe+j0l+pvqKi VKpkyhb6ZX2PWrE3Ymx8mPg4DcNCv7pUB8vYgPzSJ1PZk3aWaCi7Wc/lnQaVBrJzHH Csn2qRB/8l6+l9s/RiNmkCepvP4Er/DHYUES3AajTtbLLA4Gq8ajrnIgu2hQyAbxZ0 HLDqRq13vxV+w== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30429 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 6C43A27BC81; Fri, 18 Jun 2021 18:22:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2C1B627BC78 for ; Fri, 18 Jun 2021 18:22:07 +0100 (BST) Received: from localhost ([::1]:52748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBy-0001nu-5c for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAB-00081b-3h for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAA-0004HB-OT for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAA-0004uc-K9 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 29/37] glib: Use a correct python in scripts when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679418590 (code B ref 49025); Fri, 18 Jun 2021 17:20:14 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:54 +0000 Received: from localhost ([127.0.0.1]:58064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9p-0004pf-ME for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:53 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9F-0004j9-8c for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKGdn; Fri, 18 Jun 2021 19:19:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:23 +0200 Message-Id: <20210618171631.20534-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036757; bh=lCJWeyObrNhygznWt8O1GFxQ1qcJ7GORkrjP1mPEuYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=SpaKT6pID5BTdRcY3GZkhUOTM1baVNsI+qzPuVw8gQYNEf0RZ46eAIrDjqV5TTZYp lj1Enc8g+79eJuVXB3hnRBCB2piR+E8CcJYx+uVH8649iMzm9tE3RIqaqCJRm6OX9W hBjx/LyLoEC1iO+MCZjUYjO+uSSTGMiujYyVvH5/Ko+7SrKiEsRO24PyaMjayETCbT a9LqpqYqKxEwM8uYxTUrUX6S2qSxfqKNfjVPF1fdp+UwXYD70qq1XyCvTpB7qIhX/u U1wZdX4EPeaRIqsTwKhwYbAAuP08rHata7wHSnLtCNuLX27r/NPX9eflnC2AGBDJlr r3zbO/cLtHdIw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches During the build, a native python should be used as these scripts will be invoked during the build, but when installed, they should be a python for the system we're compiling for. * gnu/packages/glib.scm (glib)[arguments]<#:phases>{patch-python-references}: Look up "python" in 'native-inputs', not 'inputs'. (glib)[inputs]{python,python-wrapper,bash-minimal}: New inputs. --- gnu/packages/glib.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 94276ae0ef..25c5ae494b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Arthur Margerit +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -222,14 +223,19 @@ shared NFS home directories.") #t)) ;; Python references are not being patched in patch-phase of build, ;; despite using python-wrapper as input. So we patch them manually. + ;; + ;; These python scripts are both used during build and installed, + ;; so at first, use a python from 'native-inputs', not 'inputs'. When + ;; cross-compiling, the 'patch-shebangs' phase will replace + ;; the native python with a python from 'inputs'. (add-after 'unpack 'patch-python-references - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in" "glib/gtester-report.in" "gobject/glib-genmarshal.in" "gobject/glib-mkenums.in") (("@PYTHON@") - (string-append (assoc-ref inputs "python") + (string-append (assoc-ref (or native-inputs inputs) "python") "/bin/python" ,(version-major+minor (package-version python))))) @@ -282,6 +288,13 @@ shared NFS home directories.") ("xsltproc" ,libxslt))) (inputs `(("bash-completion" ,bash-completion) + ;; "python", "python-wrapper" and "bash-minimal" + ;; are for the 'patch-shebangs' phase, to make + ;; sure the installed scripts end up with a correct shebang + ;; when cross-compiling. + ("python" ,python) + ("python-wrapper" ,python-wrapper) + ("bash-minimal" ,(canonical-package bash-minimal)) ("dbus" ,dbus) ("libelf" ,libelf))) (propagated-inputs From patchwork Fri Jun 18 17:16:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30444 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 BE54727BC83; Fri, 18 Jun 2021 18:23:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 833A027BC78 for ; Fri, 18 Jun 2021 18:23:04 +0100 (BST) Received: from localhost ([::1]:56574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICt-0004Tt-KJ for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAC-00087H-R6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAC-0004Im-HF for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAC-0004v6-Dm for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 30/37] glib: Verify the cross-compiled python is used in installed scripts. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679518619 (code B ref 49025); Fri, 18 Jun 2021 17:20:16 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:55 +0000 Received: from localhost ([127.0.0.1]:58072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9r-0004q9-0C for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:55 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9F-0004jA-LN for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKHe1; Fri, 18 Jun 2021 19:19:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:24 +0200 Message-Id: <20210618171631.20534-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036757; bh=giAeuQfjk3falpP+LZZcVxXeFPnS4KkQbVcp7Utdx7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=DMyZSUzQL2FVMttMTiwFDeayL005AG2h0BubsgPFfvkKVP+K++Sdns6eeumFnDIpz 7jM8jr+I1g+3+hmk4HME8kO4ykqo/9pUrkBYqoaYxGmQUw6Csg5wnYUlPCeIE/c3i1 cOuoYAlK5P3dO6I45KtWsmkAwHZVvN5OJb/nPpQhmMYLeEgJRpOSmSmE/y3BjK7Ryg jR0WzSdCkDXqCQCdqVEd4H6Q+/HcEMfNFKMcl4lKeVHGFCkeXTR4vpHGmggTSz5/oZ kD+xXJBXcBSqrZZ/U6DdQHhWagK4MUvig0PoCy9JHJJaV1Fwd/5tbNNKJZggC2hf4g TBiO9FbguGzwQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (glib)[arguments]<#:disallowed-references>: Disallow the native python when cross-compiling. --- gnu/packages/glib.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 25c5ae494b..244544ea6f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -77,6 +77,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) + #:use-module (srfi srfi-26) #:use-module ((srfi srfi-1) #:hide (zip)) ;; Export variables up-front to allow circular dependency with the 'xorg' @@ -200,7 +202,15 @@ shared NFS home directories.") (outputs '("out" ; everything "bin")) ; glib-mkenums, gtester, etc.; depends on Python (arguments - `(#:disallowed-references (,tzdata-for-tests) + `(#:disallowed-references + (,tzdata-for-tests + ;; Verify glib-mkenums, gtester, ... use the cross-compiled + ;; python. + ,@(if (%current-target-system) + (map (cut gexp-input <> #:native? #t) + `(,(this-package-native-input "python") + ,(this-package-native-input "python-wrapper"))) + '())) #:configure-flags '("-Dman=true" "-Dselinux=disabled") #:phases From patchwork Fri Jun 18 17:16:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30433 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 47BA127BC81; Fri, 18 Jun 2021 18:22:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C32827BC78 for ; Fri, 18 Jun 2021 18:22:16 +0100 (BST) Received: from localhost ([::1]:53616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIC7-0002Nq-2i for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAD-00088K-6C for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAC-0004JN-TL for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAC-0004vD-Pz for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 31/37] glib: Look up "tzdata" in 'native-inputs', not 'inputs'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679518626 (code B ref 49025); Fri, 18 Jun 2021 17:20:16 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:55 +0000 Received: from localhost ([127.0.0.1]:58074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9r-0004qG-9C for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:55 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9G-0004j5-1Y for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKHe5; Fri, 18 Jun 2021 19:19:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:25 +0200 Message-Id: <20210618171631.20534-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036757; bh=vxnBAG50YIH3F0oavVB7X2j23R02j34MPE0qrGyVBi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=jKRzehJ2Dx/wqEPd+m+IP8cs232BHOJdLi/iEVbFk63pe+gkb08axKPsfVgDhQhRK +RT497AwI5JKfsKjyGM1chneHS6qrGkI43okgq4J/keBe3vpdIoaNRqB4MStYjaTSh ytqY5eTZ/HTMPOR7ZVUgF6wJR8sDA4b0GgWS47vByDho8PuckcItnHA+KZAu62rOwU p/myme3nzKa+8hassYKd6dx95hXE4vmOkkdZaRdf/B0YHwWpParPaiqioIvUf3i9r7 AMbA4OzYKYqLh2+epPjWhEPVlzcQSKl/G9XU4EgBoizBE10AWKyY45tQmhCb74+gSX HSB1nUkR+loTA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Otherwise, "tzdata" won't be found when cross-compiling and string-append will complain about types. Alternatively, "tzdata" could be moved from 'native-inputs' to 'inputs'. * gnu/packages/glib.scm (glib)[arguments]<#:phases>{pre-check}: Look up "tzdata" in 'native-inputs', not 'inputs'. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 244544ea6f..57e8282a89 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -251,10 +251,11 @@ shared NFS home directories.") (package-version python))))) #t)) (add-before 'check 'pre-check - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") + (string-append (assoc-ref (or native-inputs inputs) + "tzdata") "/share/zoneinfo")) ;; Some tests want write access there. (setenv "HOME" (getcwd)) From patchwork Fri Jun 18 17:16:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30447 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 6B2AA27BC81; Fri, 18 Jun 2021 18:23: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4077C27BC78 for ; Fri, 18 Jun 2021 18:23:18 +0100 (BST) Received: from localhost ([::1]:57294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luID7-0004yB-BL for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:23:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAD-00089M-J5 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAD-0004K5-9u for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAD-0004vL-6f for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 32/37] tk: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679518633 (code B ref 49025); Fri, 18 Jun 2021 17:20:17 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:55 +0000 Received: from localhost ([127.0.0.1]:58076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9r-0004qN-Hv for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:55 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9G-0004j6-CW for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:18 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKHeH; Fri, 18 Jun 2021 19:19:18 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:26 +0200 Message-Id: <20210618171631.20534-32-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036758; bh=5uYwnGhqcyoz8f9UYuhpumozlHAVHIx5CnK53MVgB28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=JiDyEkK6NyOBo/mB4HOb++rPLa0Sl8J/mWzTfIxIQaJteAIu85EbBvZSWdydtJwvP PhCJW7P+ea/mcC+1TqOkyBFy5g/sUWgZqPper86r26ZH0+93XW0ZA0D59cL6syZSps +iFQ+3Pj0m0DsQcaeIt2BgFjt4hz7LayW2ZF91dSDrzP3GX34vTqCu9ot6SwVXVrH2 ZliUV+UxHdamp0mpbJEJdqFIilWMu9Hmobod85eqCL/rzmSi3/HHjstoAyPd/njubm sPt2BxV1Lwz2pSb1ST2I8TclVWs7Q9k9xL7orTsdhqBdm2tiLuAs8YabRaJmRWH9mg u4kuvxUzZ8zKw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30440 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 EBBC927BC81; Fri, 18 Jun 2021 18:22:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B989527BC78 for ; Fri, 18 Jun 2021 18:22:44 +0100 (BST) Received: from localhost ([::1]:55318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICZ-0003XS-QS for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAD-0008AS-W0 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAD-0004KR-Nu for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAD-0004vS-KG for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 33/37] tk: Do not use %build-inputs when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679618641 (code B ref 49025); Fri, 18 Jun 2021 17:20:17 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:56 +0000 Received: from localhost ([127.0.0.1]:58078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9r-0004qU-QF for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:56 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9G-0004j8-P4 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:19 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKJeR; Fri, 18 Jun 2021 19:19:18 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:27 +0200 Message-Id: <20210618171631.20534-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036758; bh=zt7BAM2kxTcKP2NYK6l7VYfWxdJEaUVC9x+20Op9hjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=pbvh/Rodp5UEzg3AsEroldsEI6zrkq1dEOMMcC+Aj6Fm+m9q8pGzwfK16OqvGlqtx 32pcAB+CP4HoTMRGsD4awX6u6j7WCeGDZOdana5EQkM+gdz2SVKoHjPWp2XSdLygZi 0y4CZIoMSZw/qwI4M55F6irVM/VH4hm8iw42Tb2Vu71E6PH011beVEugLbm1Ucw2aQ jj4UxjuXFk0S38B8lZwZxyYL82+Oo1jJ+A2m6d8uNClsR/o1oQaUKQ/DucAr/rpzlP YTE7LnL+X6Q1aWRgN+GkQWZ1G993qzbfM/KOMB5APP2cfJrK/4h+4YOrojqHdCPjKa 1g4p4HqsfOmGQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30434 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 2F2B627BC78; Fri, 18 Jun 2021 18:22: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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D7FB27BC81 for ; Fri, 18 Jun 2021 18:22:19 +0100 (BST) Received: from localhost ([::1]:53936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICA-0002b0-Ew for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAF-0008D1-3h for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAE-0004Le-Nx for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAE-0004vh-Kf for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 34/37] libelf: Use the cross-compiler when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679618655 (code B ref 49025); Fri, 18 Jun 2021 17:20:18 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:56 +0000 Received: from localhost ([127.0.0.1]:58082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9s-0004qj-Ch for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:56 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9H-0004j9-3S for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:19 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKJeW; Fri, 18 Jun 2021 19:19:18 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:28 +0200 Message-Id: <20210618171631.20534-34-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036758; bh=RWokKCzoehfrSlcLNti6dqTDx97owvOxCcB16lv8MSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Eilbndoqs0aRP3VagJ4JicRj8G5sQmmRiYhb6/RY+FnYriwwlPyXPyDX9+i6d6q+F FrubbxR+sP9XRqeYCUKdFzj12b6j0g4c27hUgYtjVyINAImn2C1FYIYy69BHaiD2DO 2Nx39FUSrwzb2EuJh6F5ve7NgrFCUgjktZ60rCQzGoOTLUXyd2p3bFSvtf1MNjaqtN xC/y+MicXDsP6CrlLEcrEP+Wkg+F9cJ+1ovHkvCd+4XHnLD7v4LZBcoY/x4czdcF8e n7eOw6T8GUk9Zf3N0f+RV1QPOiNQ2smAOYBSF+tkRhaIqfGDo53xtKz+oR4dYZfSI2 R/I6L5S/ziA2g== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org 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 Fri Jun 18 17:16:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30443 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 1C26C27BC78; Fri, 18 Jun 2021 18:22:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 97C7927BC81 for ; Fri, 18 Jun 2021 18:22:54 +0100 (BST) Received: from localhost ([::1]:56064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICj-00046x-LA for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAE-0008Bd-Gq for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAE-0004LA-8B for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAE-0004vZ-4F for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 35/37] opendht: Correct 'nettle' variable name in inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20: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.162403679618648 (code B ref 49025); Fri, 18 Jun 2021 17:20:18 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:56 +0000 Received: from localhost ([127.0.0.1]:58080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9s-0004qc-3b for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:56 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9H-0004j3-FO for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:19 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKJea; Fri, 18 Jun 2021 19:19:19 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:29 +0200 Message-Id: <20210618171631.20534-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036759; bh=mQc4bfvIiXbBC0LdrMy992TtZOsGoT1AF1x3F6ZKEDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=lwidCeR5mkQuOCH0KN27fWmb8KDYk/rXFfrODdiI3Y5v/Dev6F5Hk1x/h7oweED9d /G+IjaAr/1rzrNJsbSWQ3EnK43EEAXxgfdxIlk1+229K+FykHaPXOpztlTqDJxBO3n e6bi4P/xUuCtxQOIbF4K1fQM+DCiRRvSSsuWQrnC0SyZHmR+i3wayIfqCdTe5UwJPa Lg2kR0nzYL+fqfxaZCGe27MKCgupmRE6VNWg5jb3Rm4wCnQmMEe+p/S5RDQvW5U5TT flkMnNFGzAW8CMSQuN+Bn/cqr3dB1bYVMigLkKUqMTFkRHGblbUssHoxa7NGHV4ovd 3lIc131/LzDGQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Previously, opendht referred to 'nettle-3.7'. But nettle-3.7 has been renamed to simply 'nettle'. So, refer to 'nettle' instead of 'nettle-3.7'. This should fix recent evaluation failures of core-updates on ci.guix.gnu.org. * gnu/packages/networking.scm (opendht)[inputs]{nettle}: Refer to 'nettle' instead of 'nettle-3.7'. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 62c4d7a392..6b154067b1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3478,7 +3478,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (build-system cmake-build-system) (inputs `(("argon2" ,argon2) - ("nettle" ,nettle-3.7) + ("nettle" ,nettle) ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) ;required for the DHT proxy From patchwork Fri Jun 18 17:16:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30437 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 33D7E27BC81; Fri, 18 Jun 2021 18:22:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9621D27BC78 for ; Fri, 18 Jun 2021 18:22:31 +0100 (BST) Received: from localhost ([::1]:54468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICM-0002x1-8i for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAF-0008E5-Tm for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAF-0004MN-IG for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAF-0004vw-Fn for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 36/37] cross-base: Fix cross-compiler for i686-linux-gnu. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:19 +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.162403680318701 (code B ref 49025); Fri, 18 Jun 2021 17:20:19 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:20:03 +0000 Received: from localhost ([127.0.0.1]:58086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9t-0004qy-Ja for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:20:03 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9H-0004jA-Rg for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:23 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKKeh; Fri, 18 Jun 2021 19:19:19 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:30 +0200 Message-Id: <20210618171631.20534-36-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036759; bh=cL6/X82yxoqwh+DYMtBl3NVxy2HSHe9g4hdvR4Kv7Bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=WQoO5oH7JUufqZdiA37OEnNqY+t00vKOX4hFYZlM56HQbXt5WraYlXqUp6DikKuBP hyLAiWQs2s8q/n+Sm4fz5LARiKsyNe0F6yH1YxUdZ0gHqALSympyPoVmyUDDcr1s0N JZTFgHfZKCdJoLDS2D2Vw5wnTrAEAirjVGnI2e/kpD1iFN1/sLRTRwT1Bmfp9/ULq5 ehJki+ahmH3GRaxnXxQcsx2ERmtl2FZefrdatj+ixcCaiFAS/+B5HBxsZvFbATAimK ENoGDqjM3FeH+6tgeGIZSwP42SnQbvMHT5j15QJ7lE6KsbKLTa+KFGGdqzl87I4EpS Bz99qFtq1tSqQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches GCC doesn't find libgcc_s.so anymore and looks in the wrong location. Fix this (well, more a work-around really). * gnu/packages/cross-base.scm (cross-gcc-arguments)<#:configure-flags>: Add --with-toolexecdir, such that libstdc++ ends up in the right place. Add --with-slibdir such that libgcc_s.so end up in the right place. (cross-gcc-arguments)<#:phases>{move-shared-libraries}: New phase, moving libraries in the correct place. Delete .la files, libasan.so and libusan.so to prevent circular references. Likewise, fix a reference in libstdc++.so.VERSION-gdb.py. --- gnu/packages/cross-base.scm | 63 +++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 9487ac9238..995b4ae065 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) @@ -169,9 +171,26 @@ base compiler and using LIBC (which may be either a libc package or #f.)" )) ;; Install cross-built libraries such as libgcc_s.so in - ;; the "lib" output. + ;; the "lib" output. At least for version 8.4.0, GCC + ;; will put libstdc++ in ${toolexecdir}/lib instead. + ;; (A bug?) So set --with-toolexecdir as well. + ,@(if libc - `((string-append "--with-toolexeclibdir=" + `((string-append "--with-toolexecdir=" + (assoc-ref %outputs "lib")) + (string-append "--with-toolexeclibdir=" + (assoc-ref %outputs "lib") + "/" ,target "/lib")) + '()) + ;; At least for GCC 8.0, libgcc_s.so and libstdc++.so + ;; are not installed in the location specified in + ;; --with-toolexeclibdir so GCC will not find it + ;; when cross-compiling, say, GNU Hello. + ;; + ;; Work-around by specifying slibdir. This is not + ;; sufficient, see move-shared-libraries below. + ,@(if (and libc (version>=? (package-version xgcc) "8.0")) + `((string-append "--with-slibdir=" (assoc-ref %outputs "lib") "/" ,target "/lib")) '()) @@ -193,7 +212,45 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ,flags)) flags)) ((#:phases phases) - `(cross-gcc-build-phases ,target ,phases)))))) + (if (and libc (version>=? (package-version xgcc) "8.0")) + #~(modify-phases (cross-gcc-build-phases #$target #$phases) + (add-after 'install 'move-shared-libraries + (lambda _ + (let* ((slib (format #f "~a/~a/lib/" #$output:lib #$target)) + (badlib (format #f "~a/~a/lib/" #$output #$target)) + (libs (map basename (find-files badlib #:fail-on-error? #t)))) + (for-each + (lambda (lib) + (let ((from (string-append badlib lib)) + (to (string-append slib lib))) + (when (file-exists? to) + (error "~a was found twice, refusing to overwrite!" + lib)) + ;; The debugging script libstdc++.so.VERSION-gdb.py has + ;; reference to #$output. Correct it. + (when (string-suffix? "-gdb.py" lib) + (substitute* from + (("libdir = '(.*)'") + (string-append "libdir = '" slib "'"))) + (system* "cat" from)) + ;; The .la files have references to BADLIB, + ;; leading to cyclic references between + ;; the outputs of the package. Remove them + ;; and hope noone notices. + ;; + ;; Likewise, libasan.so.* and libubsan.so.* + ;; have references to #$output. + (if (or (string-suffix? ".la" lib) + (string-prefix? "libasan.so" lib) + (string-prefix? "libubsan.so" lib)) + (delete-file from) + (rename-file from to)))) + libs) + ;; If you have "cyclic references" problems, + ;; uncomment this and use --keep-failed to figure + ;; things out. + (copy-recursively #$output:lib "out-test"))))) + #~(cross-gcc-build-phases #$target #$phases))))))) (define (cross-gcc-patches xgcc target) "Return GCC patches needed for XGCC and TARGET." From patchwork Fri Jun 18 17:16:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30442 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 ACCED27BC83; Fri, 18 Jun 2021 18:22:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E096727BC78 for ; Fri, 18 Jun 2021 18:22:52 +0100 (BST) Received: from localhost ([::1]:55922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICh-0003zd-VX for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAF-0008DW-F9 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAF-0004ME-6S for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAF-0004vo-3J for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 37/37] meson: Support cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:19 +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.162403679718663 (code B ref 49025); Fri, 18 Jun 2021 17:20:19 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:57 +0000 Received: from localhost ([127.0.0.1]:58084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9s-0004qq-QG for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:57 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9I-0004j5-9n for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:21 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKKem; Fri, 18 Jun 2021 19:19:20 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:31 +0200 Message-Id: <20210618171631.20534-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036760; bh=9QgLcPXJWK9iabqmcx9sqfvov3avBGvRjKPIpMrusAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=M3kPZfuq1nBYyL4Ag+XwuaJ1RRIuDH/WAYpXTOV5bj2Ewzte0gvVxgWxzJADj8OWt /hNGIcNW/g/qBp6trAgmaZKwjJsZK5En8bYI0PKk39hUkpDf1BpqKPYGbboACXBCi5 6k01HSmGrR0vD0bfchhxy6kyUKJKCD92fxdif8zA43PbW3S7q8M/nMOWpM0SKnpUNE d0bWulh0ZZNKQbALeB9Za26yLMvQN6GLcmA+veB5SmTJJ8bPBRcbERqM+xZd44eBey J+809uZZQPD2mkGLKiZDAqbBDAiZCT8JqL38y1SLoLYo6RWUSvo8tVkGvvjzDae5WG gxDRblpunsuAg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches For cross-compilation, meson needs to be passed a ‘cross file’ with information on the architecture, CPU type, endianness and operating system, and the name of the cross-compiler binaries. The new module (guix build meson-configuration) has some utilities for writing these cross files, used by 'make-cross-file' in a G-exp. The values for the cross file are generated by 'make-machine-alist' and 'make-binaries-alist'. 'make-machine-alist' and 'make-binaries-alist' live on the host side, such that new architectures and operating systems can be added without causing rebuilds for old architectures. Currently, only GNU/Hurd, GNU/Linux, MinGW, x86-32 and x86-64 are supported by 'make-machine-alist'. For other architectures, someone needs to figure out what to use as ‘CPU type’ first. Only i686-linux-gnu has been tested. This has been tested with: $ ./pre-inst-env guix build glib --target=i686-linux-gnu on a x86_64-linux system. ‘If it compiles, it should work.’ * guix/build/meson-configuration.scm (configuration-port): New parameter. (write-section-header): New procedure. (write-assignment): New procedure. (write-assignments): New procedure. * guix/build-system/meson.scm (target-hurd?): New predicate. (make-machine-alist): New procedure. (make-binaries-alist): New procedure. (make-cross-file): New procedure. (meson-cross-build): New procedure. (lower)[build-inputs]: Add standard cross packages when cross-compiling. Do not include regular 'inputs' when cross-compiling. (lower)[host-inputs]: Include 'inputs' when cross-compiling. (lower)[target-inputs]: Add cross packages when cross-compiling. (lower)[build]: Call 'meson-cross-build' instead of 'cross-build' when cross-compiling. (lower)[target]: Set it. (lower)[private-keywords]: Do not remove #:target when cross-compiling. --- Makefile.am | 1 + guix/build-system/meson.scm | 197 ++++++++++++++++++++++++++--- guix/build/meson-configuration.scm | 71 +++++++++++ 3 files changed, 250 insertions(+), 19 deletions(-) create mode 100644 guix/build/meson-configuration.scm diff --git a/Makefile.am b/Makefile.am index a10e06e5a7..d4bf626fd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,6 +234,7 @@ MODULES = \ guix/build/emacs-utils.scm \ guix/build/java-utils.scm \ guix/build/lisp-utils.scm \ + guix/build/meson-configuration.scm \ guix/build/maven/java.scm \ guix/build/maven/plugin.scm \ guix/build/maven/pom.scm \ diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 5adc0f92c8..1f763af2aa 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,8 @@ #:use-module (guix packages) #:use-module (ice-9 match) #:export (%meson-build-system-modules - meson-build-system)) + meson-build-system + make-cross-file)) ;; Commentary: ;; @@ -40,6 +42,62 @@ ;; ;; Code: +(define (target-hurd? triplet) + (and (string-suffix? "-gnu" triplet) + (not (string-contains triplet "linux")))) + +(define (make-machine-alist triplet) + "Make an association list describing what should go into +the ‘host_machine’ section of the cross file when cross-compiling +for TRIPLET." + `((system . ,(cond ((target-hurd? triplet) "gnu") + ((target-linux? triplet) "linux") + ((target-mingw? triplet) "windows") + (#t (error "meson: unknown operating system")))) + (cpu_family . ,(cond ((target-x86-32? triplet) "x86") + ((target-x86-64? triplet) "x86_64") + ((target-arm32? triplet) "arm") + ((target-aarch64? triplet) "aarch64") + ((target-powerpc? triplet) + (if (target-64bit? triplet) + "ppc64" + "ppc")) + (#t (error "meson: unknown architecture")))) + (cpu . ,(cond ((target-x86-32? triplet) ; i386, ..., i686 + (substring triplet 0 4)) + ((target-x86-64? triplet) "x86_64") + (#t (error "meson: unknown CPU")))) + (endian . ,(cond ((string-prefix? "powerpc64le-" triplet) "little") + ((string-prefix? "mips64el-" triplet) "little") + ((target-x86-32? triplet) "little") + ((target-x86-64? triplet) "little") + (#t (error "meson: unknown architecture")))))) + +(define (make-binaries-alist triplet) + "Make an associatoin list describing what should go into +the ‘binaries’ section of the cross file when cross-compiling for +TRIPLET." + `((c . ,(cc-for-target triplet)) + (cpp . ,(cxx-for-target triplet)) + (pkgconfig . ,(pkg-config-for-target triplet)) + (objcopy . ,(string-append triplet "-objcopy")) + (ar . ,(string-append triplet "-ar")) + (ld . ,(string-append triplet "-ld")) + (strip . ,(string-append triplet "-strip")))) + +(define (make-cross-file triplet) + (computed-file "cross-file" + (with-imported-modules '((guix build meson-configuration)) + #~(begin + (use-modules (guix build meson-configuration)) + (call-with-output-file #$output + (lambda (f) + (parameterize ((configuration-port f)) + (write-section-header "host_machine") + (write-assignments '#$(make-machine-alist triplet)) + (write-section-header "binaries") + (write-assignments '#$(make-binaries-alist triplet))))))))) + (define %meson-build-system-modules ;; Build-side modules imported by default. `((guix build meson-build-system) @@ -68,24 +126,34 @@ #:rest arguments) "Return a bag for NAME." (define private-keywords - `(#:meson #:ninja #:inputs #:native-inputs #:outputs #:target)) - - (and (not target) ;; TODO: add support for cross-compilation. - (bag - (name name) - (system system) - (build-inputs `(("meson" ,meson) - ("ninja" ,ninja) - ,@native-inputs - ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) - (host-inputs (if source - `(("source" ,source)) - '())) - (outputs outputs) - (build meson-build) - (arguments (strip-keyword-arguments private-keywords arguments))))) + `(#:meson #:ninja #:inputs #:native-inputs #:outputs + ,@(if target + '() + '(#:target)))) + + (bag + (name name) + (system system) (target target) + (build-inputs `(("meson" ,meson) + ("ninja" ,ninja) + ,@native-inputs + ,@(if target '() inputs) + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(if target + (standard-cross-packages target 'host) + '()) + ,@(standard-packages))) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@(if target inputs '()))) + ;; Keep the standard inputs of 'gnu-buid-system'. + (target-inputs (if target + (standard-cross-packages target 'target) + '())) + (outputs outputs) + (build (if target meson-cross-build meson-build)) + (arguments (strip-keyword-arguments private-keywords arguments)))) (define* (meson-build name inputs #:key @@ -161,6 +229,97 @@ has a 'meson.build' file." #:disallowed-references disallowed-references #:guile-for-build guile))) +(define* (meson-cross-build name + #:key + target + build-inputs host-inputs target-inputs + guile source + (outputs '("out")) + (configure-flags ''()) + (search-paths '()) + (native-search-paths '()) + + (build-type "debugoptimized") + (tests? #f) + (test-target "test") + (glib-or-gtk? #f) + (parallel-build? #t) + (parallel-tests? #f) + (validate-runpath? #t) + (patch-shebangs? #t) + (strip-binaries? #t) + (strip-flags ''("--strip-debug")) + (strip-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (elf-directories ''("lib" "lib64" "libexec" + "bin" "sbin")) + (phases '%standard-phases) + (system (%current-system)) + (imported-modules %meson-build-system-modules) + (modules '((guix build meson-build-system) + (guix build utils))) + allowed-references + disallowed-references) + "Cross-build SOURCE for TARGET using MESON, and with INPUTS, assuming that +SOURCE has a 'meson.build' file." + (define cross-file + (make-cross-file target)) + (define inputs + (if (null? target-inputs) + (input-tuples->gexp host-inputs) + #~(append #$(input-tuples->gexp host-inputs) + #+(input-tuples->gexp target-inputs)))) + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + + (define build-phases + #$(let ((phases (if (pair? phases) (sexp->gexp phases) phases))) + (if glib-or-gtk? + phases + #~(modify-phases #$phases + (delete 'glib-or-gtk-compile-schemas) + (delete 'glib-or-gtk-wrap))))) + + ;; Do not use 'with-build-variables', as there should be + ;; no reason to use %build-inputs and friends. + (meson-build #:source #+source + #:system #$system + #:outputs #$(outputs->gexp outputs) + #:inputs #$inputs + #:native-inputs #+(input-tuples->gexp build-inputs) + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:native-search-paths '#$(sexp->gexp + (map search-path-specification->sexp + native-search-paths)) + #:phases build-phases + #:configure-flags `("--cross-file" #+cross-file + ,@#$(sexp->gexp configure-flags)) + #:build-type #$build-type + #:tests? #$tests? + #:test-target #$test-target + #:parallel-build? #$parallel-build? + #:parallel-tests? #$parallel-tests? + #:validate-runpath? #$validate-runpath? + #:patch-shebangs? #$patch-shebangs? + #:strip-binaries? #$strip-binaries? + #:strip-flags #$(sexp->gexp strip-flags) + #:strip-directories #$(sexp->gexp strip-directories) + #:elf-directories #$(sexp->gexp elf-directories))))) + + (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) + system #:graft? #f))) + (gexp->derivation name builder + #:system system + #:target target + #:substitutable? substitutable? + #:allowed-references allowed-references + #:disallowed-references disallowed-references + #:guile-for-build guile))) + (define meson-build-system (build-system (name 'meson) diff --git a/guix/build/meson-configuration.scm b/guix/build/meson-configuration.scm new file mode 100644 index 0000000000..81b4eaa7e1 --- /dev/null +++ b/guix/build/meson-configuration.scm @@ -0,0 +1,71 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build meson-configuration) + #:use-module (ice-9 match) + #:export (write-section-header write-assignment + write-assignments make-machine-alist + configuration-port)) + +;; Commentary: +;; +;; Utilities for generating a ‘Cross build definition file’ for +;; the Meson build system. Configuration values are currently +;; never escaped. In practice this is unlikely to be a problem +;; in the build environment. +;; +;; Code: + +(define configuration-port + (fluid->parameter (make-unbound-fluid))) + +(define (write-section-header section-name) + "Write a section header for section named SECTION-NAME +to the configuration port." + (format (configuration-port) "[~a]~%" section-name)) + +(define (write-assignment key value) + "Write an assignment of VALUE to KEY to the configuration +port. VALUE must be a string (without any special characters +such as quotes), a boolean or an integer. Lists are currently +not supported" + (define port (configuration-port)) + (match value + ((? string?) + (format port "~a = '~a'~%" key value)) + ((? integer?) + (format port "~a = ~a~%" key value)) + (#f + (format port "~a = true~%" key)) + (#t + (format port "~a = false~%" key)))) + +(define* (write-assignments alist) + "Write the assignments in ALIST, an association list, +to the configuration port." + (for-each (match-lambda + ((key . value) + (write-assignment key value))) + alist)) + +(define* (make-machine-alist #:key system cpu-family cpu endian) + "Make an association list for the [host_machine] section." + `((system . ,system) + (cpu-family . ,cpu-family) + (cpu . ,cpu) + (endian . ,endian)))