From: Ricardo Wurmus <rekado@elephly.net>
To: 52333@debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@elephly.net>
Subject: bug#52333: [PATCH 2/2] gnu: r-minimal: Remove extraneous references.
Date: Mon, 6 Dec 2021 18:30:54 +0100 [thread overview]
Message-ID: <20211206173054.29439-2-rekado@elephly.net> (raw)
In-Reply-To: <20211206173054.29439-1-rekado@elephly.net>
* 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
next prev parent reply other threads:[~2021-12-06 17:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 16:56 bug#52333: [PATCH] Remove extraneous references Ricardo Wurmus
2021-12-06 17:30 ` bug#52333: [PATCH 1/2] gnu: python-nbconvert: Embed reference to texlive-bin, not texlive-union Ricardo Wurmus
2021-12-06 17:30 ` Ricardo Wurmus [this message]
2021-12-06 23:03 ` Ricardo Wurmus
2021-12-15 12:53 ` bug#52333: [PATCH] Remove extraneous references Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211206173054.29439-2-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=52333@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.