me
/
guix
Archived
1
0
Fork 0
Code

gnu: cgit: Fix cross compilation. 

* gnu/packages/version-control.scm (cgit)[native-inputs]: Move bzip2, gzip and
xz to ...
[inputs]: ... here. Add bash-minimal.
[arguments]: Use cc-for-target.
master
Arun Isaac 2023-08-17 23:46:20 +01:00
parent faad060771
commit db52c06c3d
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1043,7 +1043,8 @@ collaboration using typical untrusted file hosts or services.")
(list (list
#:tests? #f ; XXX: fail to build the in-source git. #:tests? #f ; XXX: fail to build the in-source git.
#:test-target "test" #:test-target "test"
#:make-flags '("CC=gcc" "SHELL_PATH=sh") #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
"SHELL_PATH=sh")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'unpack-git (add-after 'unpack 'unpack-git
@ -1103,7 +1104,7 @@ collaboration using typical untrusted file hosts or services.")
"html-converters/md2html"))))))) "html-converters/md2html")))))))
(native-inputs (native-inputs
;; For building manpage. ;; For building manpage.
(list asciidoc gzip bzip2 xz)) (list asciidoc))
(inputs (inputs
`(;; Building cgit requires a Git source tree. `(;; Building cgit requires a Git source tree.
("git-source" ("git-source"
@ -1114,13 +1115,20 @@ collaboration using typical untrusted file hosts or services.")
(uri "mirror://kernel.org/software/scm/git/git-2.25.4.tar.xz") (uri "mirror://kernel.org/software/scm/git/git-2.25.4.tar.xz")
(sha256 (sha256
(base32 "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq")))) (base32 "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq"))))
("bash-minimal" ,bash-minimal)
("openssl" ,openssl) ("openssl" ,openssl)
("groff" ,groff)
("python" ,python) ("python" ,python)
("python-docutils" ,python-docutils) ("python-docutils" ,python-docutils)
("python-markdown" ,python-markdown) ("python-markdown" ,python-markdown)
("python-pygments" ,python-pygments) ("python-pygments" ,python-pygments)
("zlib" ,zlib))) ("zlib" ,zlib)
;; bzip2, groff, gzip and xz are inputs (not native inputs)
;; since they are actually substituted into cgit source and
;; referenced by the built package output.
("bzip2" ,bzip2)
("groff" ,groff)
("gzip" ,gzip)
("xz" ,xz)))
(home-page "https://git.zx2c4.com/cgit/") (home-page "https://git.zx2c4.com/cgit/")
(synopsis "Web frontend for git repositories") (synopsis "Web frontend for git repositories")
(description (description