diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-03-09 18:44:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-03-09 18:44:12 +0100 |
| commit | 0c425b8d18046bac67687d2f9269da2c5f35fd75 (patch) | |
| tree | 077878d8a68903391704ba572b0e4c9ef0c372a3 | |
| parent | 768b7705977aa951c36bd37e48956bf91dcc7719 (diff) | |
| download | guix-0c425b8d18046bac67687d2f9269da2c5f35fd75.tar guix-0c425b8d18046bac67687d2f9269da2c5f35fd75.tar.gz | |
gnu: make-bootstrap: Fix static linking of tar.
Fixes a regression introduced in
4eda2034201e39edb077f0160554fabbed0e0cdb, which inadvertently commented
out those #:configure-flags.
* gnu/packages/make-bootstrap.scm (%static-inputs)[tar]: Reinstate
'gl_cv_func_working_mktime=yes' configure flag.
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 354606e15d..2eed01ece8 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -246,21 +246,21 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (tar (package (inherit tar) (arguments - `(;; Work around a cross-compilation bug whereby libgnu.a would provide - ;; '__mktime_internal', which conflicts with the one in libc.a. - ;; ,@(if (%current-target-system) - ;; `(#:configure-flags '("gl_cv_func_working_mktime=yes")) - ;; '()) - ,@(substitute-keyword-arguments (package-arguments tar) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'set-shell-file-name - (lambda _ - ;; Do not use "/bin/sh" to run programs; see - ;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>. - (substitute* "src/system.c" - (("/bin/sh") "sh") - (("execv ") "execvp "))))))))))) + (substitute-keyword-arguments (package-arguments tar) + ((#:configure-flags flags #~'()) + ;; Work around a cross-compilation bug whereby libgnu.a + ;; would provide '__mktime_internal', which conflicts + ;; with the one in libc.a. + #~'("gl_cv_func_working_mktime=yes")) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'set-shell-file-name + (lambda _ + ;; Do not use "/bin/sh" to run programs; see + ;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>. + (substitute* "src/system.c" + (("/bin/sh") "sh") + (("execv ") "execvp ")))))))))) ;; We don't want to retain a reference to /gnu/store in the bootstrap ;; versions of egrep/fgrep, so we remove the custom phase added since ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in |