From: Sergei Trofimovich <slyfox@gentoo.org>
To: 48434@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>,
"Sergei Trofimovich" <slyfox@gentoo.org>
Subject: [bug#48434] [PATCH] guile: allow pre-inst-env inject local paths
Date: Sat, 15 May 2021 10:52:27 +0100 [thread overview]
Message-ID: <20210515095227.3245343-1-slyfox@gentoo.org> (raw)
I observed the problem when tried to run 'guix refresh' from local git checkout:
$ strace -f ./pre-inst-env guix refresh -u re2c |& fgrep re2c.scm
...
[pid 3014757] openat(AT_FDCWD, "/usr/share/guile/site/3.0/gnu/packages/re2c.scm.qilB0R",
O_RDWR|O_CREAT|O_EXCL, 0600) = -1 EACCES (Permission denied)
Attempt to /usr/share happens because local directory override is ignored:
$ ./pre-inst-env guile -c '(display (search-path %load-path "gnu/packages/re2c.scm")) (newline) (display %load-path) (newline)'
/usr/share/guile/site/3.0/gnu/packages/re2c.scm
(/usr/share/guile/3.0 \
/usr/share/guile/site/3.0 \
/usr/share/guile/site \
/usr/share/guile \
/home/slyfox/dev/git/guix \
/home/slyfox/dev/git/guix)
It happens because ./guile ignores GUILE_LOAD_PATH / GUILE_LOAD_COMPILED_PATH
unconditionally.
The change keeps GUILE_LOAD_PATH / GUILE_LOAD_COMPILED_PATH for ./pre-inst-env.
* gnu/packages/aux-files/guile-launcher.c (main): don't ignore
GUILE_LOAD_PATH / GUILE_LOAD_COMPILED_PATH in GUIX_UNINSTALLED=1 mode.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
gnu/packages/aux-files/guile-launcher.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c
index 47ba069de1..bed63353a9 100644
--- a/gnu/packages/aux-files/guile-launcher.c
+++ b/gnu/packages/aux-files/guile-launcher.c
@@ -73,14 +73,19 @@ main (int argc, char **argv)
which is always preferable over the C locale. */
setlocale (LC_ALL, "en_US.utf8");
- const char *str;
- str = getenv ("GUILE_LOAD_PATH");
- load_path = str != NULL ? strdup (str) : NULL;
- str = getenv ("GUILE_LOAD_COMPILED_PATH");
- load_compiled_path = str ? strdup (str) : NULL;
+ /* Allow ./pre-inst-env to inject local paths. That way local sources
+ are preferred for most operations. */
+ if (getenv ("GUIX_UNINSTALLED") == NULL)
+ {
+ const char *str;
+ str = getenv ("GUILE_LOAD_PATH");
+ load_path = str != NULL ? strdup (str) : NULL;
+ str = getenv ("GUILE_LOAD_COMPILED_PATH");
+ load_compiled_path = str ? strdup (str) : NULL;
- unsetenv ("GUILE_LOAD_PATH");
- unsetenv ("GUILE_LOAD_COMPILED_PATH");
+ unsetenv ("GUILE_LOAD_PATH");
+ unsetenv ("GUILE_LOAD_COMPILED_PATH");
+ }
/* XXX: Do not let GMP allocate via libgc as this can lead to memory
corruption in GnuTLS/Nettle since Nettle also uses GMP:
--
2.31.1
next reply other threads:[~2021-05-15 11:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 9:52 Sergei Trofimovich [this message]
2021-08-16 17:28 ` [bug#48434] [PATCH] guile: allow pre-inst-env inject local paths Sergei Trofimovich
2021-08-16 18:52 ` Maxime Devos
2021-08-17 8:28 ` Sergei Trofimovich
2021-08-17 9:35 ` Sergei Trofimovich
2021-08-17 10:24 ` Maxime Devos
2021-08-17 12:15 ` Sergei Trofimovich
2021-08-17 13:59 ` Maxime Devos
2021-08-17 17:42 ` Sergei Trofimovich
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210515095227.3245343-1-slyfox@gentoo.org \
--to=slyfox@gentoo.org \
--cc=48434@debbugs.gnu.org \
--cc=ludo@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).