me/guix
Archived
1
0
Fork 0
Code Activity

gnu: tar: Work around a cross-compilation issue.

Browse source 
* gnu/packages/base.scm (tar)[arguments]: Add #:configure-flags when
cross-compiling.
This commit is contained in:
Ludovic Courtès 2018-04-22 22:39:49 +02:00
parent b0ff3606be
commit c77835db04
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/base.scm
View file

@ -177,7 +177,7 @@ implementation offers several extensions over the standard utility.")
(build-system gnu-build-system) (build-system gnu-build-system)
;; Note: test suite requires ~1GiB of disk space. ;; Note: test suite requires ~1GiB of disk space.
(arguments (arguments
'(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-before 'build 'set-shell-file-name (add-before 'build 'set-shell-file-name
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Do not use "/bin/sh" to run programs. ;; Do not use "/bin/sh" to run programs.
@ -187,6 +187,12 @@ implementation offers several extensions over the standard utility.")
(string-append bash "/bin/sh"))) (string-append bash "/bin/sh")))
#t)))) #t))))
;; 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"))
'())
;; Test #92 "link mismatch" expects "a/z: Not linked to a/y" but gets ;; Test #92 "link mismatch" expects "a/z: Not linked to a/y" but gets
;; "a/y: Not linked to a/z" and fails, presumably due to differences in ;; "a/y: Not linked to a/z" and fails, presumably due to differences in
;; the order in which 'diff' traverses directories. That leads to a ;; the order in which 'diff' traverses directories. That leads to a