me
/
guix
Archived
1
0
Fork 0
Code

gnu: git: Fix cross-compilation. 

* gnu/packages/version-control.scm (git-cross-configure-flags): New variable,
(git)[arguments]: add it to configure-flags. Also add cross curl-config script
to PATH.
(git-minimal): Add previous variable to configure-flags.
master
Mathieu Othacehe 2019-08-02 11:22:47 +02:00
parent 457e116698
commit 6beb6cc6df
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/version-control.scm
View File

@ -141,6 +141,10 @@ changes to project files over time. It supports both a distributed workflow
as well as the classic centralized workflow.") as well as the classic centralized workflow.")
(license license:gpl2+))) (license license:gpl2+)))
(define git-cross-configure-flags
'("ac_cv_fread_reads_directories=yes"
"ac_cv_snprintf_returns_bogus=no"))
(define-public git (define-public git
(package (package
(name "git") (name "git")
@ -233,7 +237,10 @@ as well as the classic centralized workflow.")
;; absolute file name to 'wish'. ;; absolute file name to 'wish'.
#:configure-flags (list (string-append "--with-tcltk=" #:configure-flags (list (string-append "--with-tcltk="
(assoc-ref %build-inputs "tk") (assoc-ref %build-inputs "tk")
"/bin/wish8.6")) ; XXX "/bin/wish8.6") ; XXX
,@(if (%current-target-system)
git-cross-configure-flags
'()))
#:modules ((srfi srfi-1) #:modules ((srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
@ -250,6 +257,15 @@ as well as the classic centralized workflow.")
(remove (cut string-prefix? bash-full <>) path) (remove (cut string-prefix? bash-full <>) path)
":")) ":"))
#t))) #t)))
;; Add cross curl-config script to PATH when cross-compiling.
,@(if (%current-target-system)
'((add-before 'configure 'add-cross-curl-config
(lambda* (#:key inputs #:allow-other-keys)
(setenv "PATH"
(string-append (assoc-ref inputs "curl") "/bin:"
(getenv "PATH")))
#t)))
'())
(add-after 'configure 'patch-makefiles (add-after 'configure 'patch-makefiles
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
@ -506,7 +522,10 @@ everything from small to very large projects with speed and efficiency.")
(string-append out "/share/gitweb")) (string-append out "/share/gitweb"))
#t))))) #t)))))
((#:configure-flags flags) ((#:configure-flags flags)
''()) `(list
,@(if (%current-target-system)
git-cross-configure-flags
'())))
((#:disallowed-references lst '()) ((#:disallowed-references lst '())
`(,perl ,@lst)))) `(,perl ,@lst))))
(outputs '("out")) (outputs '("out"))