me
/
guix
Archived
1
0
Fork 0
Code

gnu: make-bootstrap: Fix static linking of tar. 

Fixes a regression introduced in
4eda203420, which inadvertently commented
out those #:configure-flags.

* gnu/packages/make-bootstrap.scm (%static-inputs)[tar]: Reinstate
'gl_cv_func_working_mktime=yes' configure flag.
master
Ludovic Courtès 2023-03-09 18:44:12 +01:00
parent 768b770597
commit 0c425b8d18
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/make-bootstrap.scm
View File

@ -246,12 +246,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(tar (package (tar (package
(inherit tar) (inherit tar)
(arguments (arguments
`(;; Work around a cross-compilation bug whereby libgnu.a would provide (substitute-keyword-arguments (package-arguments tar)
;; '__mktime_internal', which conflicts with the one in libc.a. ((#:configure-flags flags #~'())
;; ,@(if (%current-target-system) ;; Work around a cross-compilation bug whereby libgnu.a
;; `(#:configure-flags '("gl_cv_func_working_mktime=yes")) ;; would provide '__mktime_internal', which conflicts
;; '()) ;; with the one in libc.a.
,@(substitute-keyword-arguments (package-arguments tar) #~'("gl_cv_func_working_mktime=yes"))
((#:phases phases) ((#:phases phases)
#~(modify-phases #$phases #~(modify-phases #$phases
(replace 'set-shell-file-name (replace 'set-shell-file-name
@ -260,7 +260,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>. ;; <http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02272.html>.
(substitute* "src/system.c" (substitute* "src/system.c"
(("/bin/sh") "sh") (("/bin/sh") "sh")
(("execv ") "execvp "))))))))))) (("execv ") "execvp "))))))))))
;; We don't want to retain a reference to /gnu/store in the bootstrap ;; 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 ;; 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 ;; grep@2.25. The effect is 'egrep' and 'fgrep' look for 'grep' in