summaryrefslogtreecommitdiff
path: root/gnu/packages/make-bootstrap.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-03-09 18:44:12 +0100
committerLudovic Courtès <ludo@gnu.org>2023-03-09 18:44:12 +0100
commit0c425b8d18046bac67687d2f9269da2c5f35fd75 (patch)
tree077878d8a68903391704ba572b0e4c9ef0c372a3 /gnu/packages/make-bootstrap.scm
parent768b7705977aa951c36bd37e48956bf91dcc7719 (diff)
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.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
-rw-r--r--gnu/packages/make-bootstrap.scm30
1 files changed, 15 insertions, 15 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 354606e15d6..2eed01ece88 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."
246 (tar (package 246 (tar (package
247 (inherit tar) 247 (inherit tar)
248 (arguments 248 (arguments
249 `(;; Work around a cross-compilation bug whereby libgnu.a would provide 249 (substitute-keyword-arguments (package-arguments tar)
250 ;; '__mktime_internal', which conflicts with the one in libc.a. 250 ((#:configure-flags flags #~'())
251 ;; ,@(if (%current-target-system) 251 ;; Work around a cross-compilation bug whereby libgnu.a
252 ;; `(#:configure-flags '("gl_cv_func_working_mktime=yes")) 252 ;; would provide '__mktime_internal', which conflicts
253 ;; '()) 253 ;; with the one in libc.a.
254 ,@(substitute-keyword-arguments (package-arguments tar) 254 #~'("gl_cv_func_working_mktime=yes"))
255 ((#:phases phases) 255 ((#:phases phases)
256 #~(modify-phases #$phases 256 #~(modify-phases #$phases
257 (replace 'set-shell-file-name 257 (replace 'set-shell-file-name
258 (lambda _ 258 (lambda _
259 ;; Do not use "/bin/sh" to run programs; see 259 ;; Do not use "/bin/sh" to run programs; see
260 ;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>. 260 ;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
261 (substitute* "src/system.c" 261 (substitute* "src/system.c"
262 (("/bin/sh") "sh") 262 (("/bin/sh") "sh")
263 (("execv ") "execvp "))))))))))) 263 (("execv ") "execvp "))))))))))
264 ;; We don't want to retain a reference to /gnu/store in the bootstrap 264 ;; We don't want to retain a reference to /gnu/store in the bootstrap
265 ;; versions of egrep/fgrep, so we remove the custom phase added since 265 ;; versions of egrep/fgrep, so we remove the custom phase added since
266 ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in 266 ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in