ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-08 07:56:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: git: Resurrect cross-compilation.

Browse source 
* gnu/packages/version-control.scm (git-cross-configure-flags): Add missing
"ac_cv_iconv_omits_bom" flag.
(git)[arguments]: Avoid modify-PATH stage when cross-compiling as it depends
on non-present "bash-for-tests".
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-04-17 11:43:23 +02:00 committed by Jan Nieuwenhuizen
parent 1c5063af86
commit fc17900583
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/version-control.scm
View file

@ -28,6 +28,7 @@
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 John D. Boy <jboy@bius.moe>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -147,7 +148,8 @@ (define-public bazaar
(define git-cross-configure-flags
'("ac_cv_fread_reads_directories=yes"
"ac_cv_snprintf_returns_bogus=no"))
"ac_cv_snprintf_returns_bogus=no"
"ac_cv_iconv_omits_bom=no"))
(define-public git
(package
@ -251,16 +253,19 @@ (define-public git
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'modify-PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((path (string-split (getenv "PATH") #\:))
(bash-full (assoc-ref inputs "bash-for-tests")))
;; Drop the test bash from PATH so that (which "sh") and
;; similar does the right thing.
(setenv "PATH" (string-join
(remove (cut string-prefix? bash-full <>) path)
":"))
#t)))
;; We do not have bash-for-tests when cross-compiling.
,@(if (%current-target-system)
'()
`((add-after 'unpack 'modify-PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((path (string-split (getenv "PATH") #\:))
(bash-full (assoc-ref inputs "bash-for-tests")))
;; Drop the test bash from PATH so that (which "sh") and
;; similar does the right thing.
(setenv "PATH" (string-join
(remove (cut string-prefix? bash-full <>) path)
":"))
#t)))))
;; Add cross curl-config script to PATH when cross-compiling.
,@(if (%current-target-system)
'((add-before 'configure 'add-cross-curl-config