From patchwork Wed Aug 25 18:02:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32259 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 74DF427BBE1; Wed, 25 Aug 2021 19:04:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 79B1627BBE4 for ; Wed, 25 Aug 2021 19:04:50 +0100 (BST) Received: from localhost ([::1]:57342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGb-0000l3-99 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFu-0007vO-9D for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFu-0000q6-0D for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFt-0002na-Rf for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 07/52] gnu: nspr: Don't retain references to native inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991463810584 (code B ref 50201); Wed, 25 Aug 2021 18:04:05 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:58 +0000 Received: from localhost ([127.0.0.1]:47679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFl-0002kW-Tv for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:58 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFV-0002ft-Vf for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:43 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3hTR; Wed, 25 Aug 2021 20:03:41 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:47 +0200 Message-Id: <20210825180332.5720-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914621; bh=h/3wGHB3nkZskJTnbC35gsMRJjoH29DxJGYjvvIUL7w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HZ/R/0RhOZDPBHJQk8sn4xohkqCx4qRsf7ns7JXRz/zgnQF4Lb5iWx0O+TTIFulhD 90Nyki+JBcVvTKT0g70l9iTK3qlHCOJMZu5fcTVBAtuqZY29M5FUvla+CuGFAASMGa AbzF63/nmzzlszv/vMD1quabhVg0EZI8klkmvr7/p5691pNcvvovXi69VDmrK/KEw+ WB+iN1krnnBRjRARSv3KYZJNiKsgP1Lqa4xssbjqLykKDS+HCwNwWjHfqw2KnqYLZe puVy3OhxGJwkD6qHBnEylra1jBQB/NwMC+GSA6Zmxd4RaI5u6GE/xLXTTlnNZE2N4S HjgwOPBGs97XQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nss.scm (nspr)[inputs]: Add 'perl' and 'bash-minimal' when cross-compiling. (nspr)[arguments]{#:disallowed-references}: Add native 'perl' when cross-compiling. --- gnu/packages/nss.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6560aede56..381756e387 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -26,10 +26,12 @@ (define-module (gnu packages nss) #:use-module (guix packages) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages perl) @@ -48,10 +50,24 @@ (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) (build-system gnu-build-system) + (inputs + ;; TODO(core-updates): Make these inputs unconditional. + ;; For 'compile-et.pl' and 'nspr-config'. + (if (%current-target-system) + `(("perl" ,perl) ; for 'compile-et.pl' + ("bash-minimal" ,bash-minimal)) ; for 'nspr-config' + '())) (native-inputs `(("perl" ,perl))) (arguments - `(#:tests? #f ; no check target + `(;; Prevent the 'native' perl from sneaking into the closure. + ;; XXX it would be nice to do the same for 'bash-minimal', + ;; but using 'canonical-package' causes loops. + ,@(if (%current-target-system) + `(#:disallowed-references + (,(gexp-input (this-package-native-input "perl") #:native? #t))) + '()) + #:tests? #f ; no check target #:configure-flags (list "--disable-static" "--enable-64bit"