[bug#69396,core-updates,v2] gnu: ld-wrapper: Also unset GUILE_LOAD_PATH.
Commit Message
The following problem was discovered while attempting to configure Guix to use
a locally built Guile tree, via its meta/uninstalled-env script, which would
attempt to use the newer Guile source files and fail with:
Pre-boot error; key: unbound-variable, args: (#f "Unbound variable:
~S" (error) #f)collect2: fatal error: ld terminated with signal 6 [Aborted]
With the following change, a Guix user may now configure their build to use a
locally built Guile with e.g.:
~/src/guile/meta/uninstalled-env ./configure --localstatedir=/var \
--sysconfdir=/etc
* gnu/packages/ld-wrapper.in: Unset GUILE_LOAD_PATH. Also unset
GUILE_SYSTEM_PATH, for symmetry. Streamline exec call, using the now fixed
'-l' option.
(ld-wrapper): Fix args being a nested list, and strip its arg0.
Change-Id: Iaaa721019f3646d851202bb018214ec9fcc04fd4
---
Changes in v2:
- Revert to load-compiled scheme to load ld.go
- Refine comment
gnu/packages/ld-wrapper.in | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
base-commit: f205179ed2cedf55aa0e046af2d80282f6a74075
Comments
Hi,
Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
> The following problem was discovered while attempting to configure Guix to use
> a locally built Guile tree, via its meta/uninstalled-env script, which would
> attempt to use the newer Guile source files and fail with:
>
> Pre-boot error; key: unbound-variable, args: (#f "Unbound variable:
> ~S" (error) #f)collect2: fatal error: ld terminated with signal 6 [Aborted]
>
> With the following change, a Guix user may now configure their build to use a
> locally built Guile with e.g.:
>
> ~/src/guile/meta/uninstalled-env ./configure --localstatedir=/var \
> --sysconfdir=/etc
>
> * gnu/packages/ld-wrapper.in: Unset GUILE_LOAD_PATH. Also unset
> GUILE_SYSTEM_PATH, for symmetry. Streamline exec call, using the now fixed
> '-l' option.
> (ld-wrapper): Fix args being a nested list, and strip its arg0.
>
> Change-Id: Iaaa721019f3646d851202bb018214ec9fcc04fd4
> ---
>
> Changes in v2:
> - Revert to load-compiled scheme to load ld.go
> - Refine comment
LGTM!
I’ll let you check with Josselin et al. whether to merge it now in
‘core-updates’ (my gut feeling is that we’d rather wait for the next
cycle, but I’ve haven’t been following lately.)
Thanks,
Ludo’.
Hello,
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> The following problem was discovered while attempting to configure Guix to use
> a locally built Guile tree, via its meta/uninstalled-env script, which would
> attempt to use the newer Guile source files and fail with:
>
> Pre-boot error; key: unbound-variable, args: (#f "Unbound variable:
> ~S" (error) #f)collect2: fatal error: ld terminated with signal 6 [Aborted]
>
> With the following change, a Guix user may now configure their build to use a
> locally built Guile with e.g.:
>
> ~/src/guile/meta/uninstalled-env ./configure --localstatedir=/var \
> --sysconfdir=/etc
>
> * gnu/packages/ld-wrapper.in: Unset GUILE_LOAD_PATH. Also unset
> GUILE_SYSTEM_PATH, for symmetry. Streamline exec call, using the now fixed
> '-l' option.
> (ld-wrapper): Fix args being a nested list, and strip its arg0.
>
> Change-Id: Iaaa721019f3646d851202bb018214ec9fcc04fd4
Pushed to core-updates.
Closing!
@@ -1,23 +1,28 @@
#!@BASH@
# -*- mode: scheme; coding: utf-8; -*-
-# XXX: We have to go through Bash because there's no command-line switch to
-# augment %load-compiled-path, and because of the silly 127-byte limit for
-# the shebang line in Linux.
-# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our
-# .go file (see <http://bugs.gnu.org/12519>).
-# Unset 'GUILE_LOAD_COMPILED_PATH' to make sure we do not stumble upon
-# incompatible .go files. See
-# <https://lists.gnu.org/archive/html/guile-devel/2016-03/msg00000.html>.
+# XXX: We have to go through Bash because there's no Guile command-line switch to
+# ignore the various Guile load path related environment variables.
+
+# Unset 'GUILE_LOAD_PATH' to make sure we do not stumble upon
+# incompatible Guile files (see
+# <https://lists.gnu.org/archive/html/guile-devel/2016-03/msg00000.html>).
+unset GUILE_LOAD_PATH
unset GUILE_LOAD_COMPILED_PATH
+unset GUILE_SYSTEM_PATH
unset GUILE_SYSTEM_COMPILED_PATH
+
+# Use `load-compiled' because `load' (and `-l') doesn't otherwise load our
+# .go file, or causes extraneous `stat' system calls when the "-C" "/" arguments
+# are provided.
main="(@ (gnu build-support ld-wrapper) ld-wrapper)"
-exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line)))" "$@"
+exec @GUILE@ -c "(load-compiled \"@SELF@.go\") ($main (command-line))" "$@"
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -285,9 +290,9 @@ library outside of ~a: ~s~%"
result
(expand-arguments result)))
-(define (ld-wrapper . args)
+(define (ld-wrapper args)
;; Invoke the real `ld' with ARGS, augmented with `-rpath' switches.
- (let* ((args (expand-arguments args))
+ (let* ((args (expand-arguments (cdr args))) ;strip arg0
(path (library-search-path args))
(libs (library-files-linked args path))
(args (append args (rpath-arguments libs))))