From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GETcAyxJrmFtdAEAgWs5BA (envelope-from ) for ; Mon, 06 Dec 2021 18:32:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id OMwpOytJrmFRcQAAB5/wlQ (envelope-from ) for ; Mon, 06 Dec 2021 17:32:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8C0273C720 for ; Mon, 6 Dec 2021 18:32:27 +0100 (CET) Received: from localhost ([::1]:49752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muHqk-0005P1-Lk for larch@yhetil.org; Mon, 06 Dec 2021 12:32:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muHqM-0005JG-7B for bug-guix@gnu.org; Mon, 06 Dec 2021 12:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1muHqL-000466-Sg for bug-guix@gnu.org; Mon, 06 Dec 2021 12:32:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1muHqL-0001CF-I6 for bug-guix@gnu.org; Mon, 06 Dec 2021 12:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#52333: [PATCH 2/2] gnu: r-minimal: Remove extraneous references. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 06 Dec 2021 17:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52333 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 52333@debbugs.gnu.org Received: via spool by 52333-submit@debbugs.gnu.org id=B52333.16388118724505 (code B ref 52333); Mon, 06 Dec 2021 17:32:01 +0000 Received: (at 52333) by debbugs.gnu.org; 6 Dec 2021 17:31:12 +0000 Received: from localhost ([127.0.0.1]:35307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muHpY-0001Ab-3Z for submit@debbugs.gnu.org; Mon, 06 Dec 2021 12:31:12 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1muHpT-0001AO-VS for 52333@debbugs.gnu.org; Mon, 06 Dec 2021 12:31:10 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1638811865; cv=none; d=zohomail.com; s=zohoarc; b=eFkrNVjr5pmNWyPIJnq5sQvWR66uvoH8hnNuNQ4wAzxeCz1NX7R5IDVNiKTWdkgbYdxv8NdYxSJo8JWZUxA2YoZI540vG5rzace4JdTuu6pyaMdKanT2icwM3UxjTzPQVXlaImY0s8as8sf4Y4at82HEDF+Mc0P6Y9Mof/1HcjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638811865; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ylapTqQwQAGtImzIGQWyytl4aXsxhADkf6uzrvqoxIw=; b=LtBp8ftHMvLV5UXJQukK4zYQRO1m/nlocCNoN8KKg2s88Y8lQyb8CwlEy4nPlclrV2PRH5xUWIGr+v0QvT5pCJ4O9vY5ajwS+jhuivTazjN2J7uzWcLyFysOmVXQOS820Pkgfeqor3FvBtHgBwhDInSjvxWcKRcRogYX2FLlowI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1638811865; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=ylapTqQwQAGtImzIGQWyytl4aXsxhADkf6uzrvqoxIw=; b=cofkzMB9voyTrdrT1QR/SWSJSCb2uxW2EcYGzBvc8FmhErdICkrgGbcqHLtv/m6p f8Y3m9QNJ57CdF/j1BQFSor7d5GTdaj8M/GprSS24ZQ7DFRYFPA4cKi7zgF36LvGOXi XA/TspaZA6uP9Is/f8FH4Bwa/fQ7/bklYlRoMH0U= Received: from localhost (p54ad4e5b.dip0.t-ipconnect.de [84.173.78.91]) by mx.zohomail.com with SMTPS id 1638811864412353.7396584736024; Mon, 6 Dec 2021 09:31:04 -0800 (PST) From: Ricardo Wurmus Date: Mon, 6 Dec 2021 18:30:54 +0100 Message-Id: <20211206173054.29439-2-rekado@elephly.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211206173054.29439-1-rekado@elephly.net> References: <20211206173054.29439-1-rekado@elephly.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ricardo Wurmus Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638811947; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ylapTqQwQAGtImzIGQWyytl4aXsxhADkf6uzrvqoxIw=; b=Av5WfFEfPuvYKA2Hi/bgs3qUY/85ORsm878u1bVfzmwDOT/CDNjGom06pMq31+3gS9Vr17 biwuiokAvm1OKOpb9CjJRmCZhGlVwc1uw+j6hVlUR7kUwpAePyh/hHjbDK+bWQ5y5vgB4/ TwFvwi+j+pjOXz34+/vkcNKyXfRMBBskleHBAZo85AkzBYDk2OpYaKEgiBKfrP5exX0nqO vRacnt8//y1n7LL6JgFYwOHtRyfdouOyQEMewBkVdC7pMiA9J/BlwZeetnk0uR50HZZD1d vdOdcvt6MAmOK0ozaftQ181X3AOwDb/a3EMteYG//8IjpHAK9c1yID7T5Ghvqw== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1638811947; a=rsa-sha256; cv=fail; b=MBfmotQFi76ubyEyaziRE5rUYiJBjiLrlVMJWXZIxcMDL8D7KrNKr0Kzs8zsrrNi+aQprW LqhwQC2cUyUy7oFqz3X0kAlzOsTk7hTrn1LhZvKr1ZAz4mnpM/+6rRUo3Whse7MhWuPZNX axwUvETc/i/W442rbXF0n6SfX5dEFw/1D2BhSvIDWBLW9F1jJeZR3EgyK8TADu94nJizoE u9x58osWbKsf/C27yyF8IxpMQLj6vgWpmFfk2i7PI27nBOtiemqVAJRa3gagsNiokFl6u3 Vy8Dxsh9jFjEgKfRFTjDEXbwfPI2507BpjIqxTHcq75GLvhfLJKfVUV5PoV8wA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=cofkzMB9; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.56 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=cofkzMB9; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8C0273C720 X-Spam-Score: 0.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: Omm2bDIYe1Tw * gnu/packages/statistics.scm (r-minimal)[arguments]: Remove references to native build-time tools. --- gnu/packages/statistics.scm | 39 ++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index cf7a64ec7a..599d6a8fc3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -403,12 +403,49 @@ (define-public r-minimal (arguments `(#:tests? #f ,@(substitute-keyword-arguments (package-arguments r-with-tests) + ((#:disallowed-references refs '()) + (cons perl refs)) ((#:configure-flags flags) ;; Do not build the recommended packages. The build system creates ;; random temporary directories and embeds their names in some ;; package files. We build these packages with the r-build-system ;; instead. - `(cons "--without-recommended-packages" ,flags))))))) + `(cons "--without-recommended-packages" ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'install 'remove-extraneous-references + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/R/etc/Makeconf") + (("^# configure.*") + "# Removed to avoid extraneous references\n")) + (substitute* (string-append out "/lib/R/bin/libtool") + (((string-append + "(-L)?(" + (assoc-ref inputs "bzip2") + "|" + (assoc-ref inputs "perl") + "|" + (assoc-ref inputs "texlive") + "|" + (assoc-ref inputs "texlive-bin") + "|" + (assoc-ref inputs "texinfo") + "|" + (assoc-ref inputs "xz") + "|" + (format #false + "/gnu/store/[^-]+-(~{~a~^|~})-[^/]+" + '("glibc-utf8-locales" + "libselinux" + "libsepol" + "file" + "texlive-bin" + "util-macros" + "graphite2")) + "|" + "/gnu/store/[^-]+-glibc-[^-]+-static" + ")/lib")) "")))))))))))) (define-public rmath-standalone (package (inherit r-minimal) -- 2.34.0