gnu: libgit2: Use system http-parser.
* gnu/packages/version-control.scm (libgit2)[source]: Update snippet. [arguments]: Add configure-flag to use system http-parser. [inputs]: Add http-parser. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
parent
633360e00e
commit
158b8600c9
1 changed files with 6 additions and 15 deletions
|
@ -612,25 +612,15 @@ (define-public libgit2
|
|||
(base32
|
||||
"0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"))
|
||||
(patches (search-patches "libgit2-mtime-0.patch"))
|
||||
|
||||
;; Remove bundled software. Keep "http-parser" because it
|
||||
;; contains patches that are not available in the system version.
|
||||
(snippet '(begin
|
||||
(with-directory-excursion "deps"
|
||||
(for-each (lambda (dir)
|
||||
(delete-file-recursively dir))
|
||||
(lset-difference equal?
|
||||
(scandir ".")
|
||||
'("." ".." "http-parser"))))
|
||||
#t))
|
||||
(modules '((guix build utils)
|
||||
(srfi srfi-1)
|
||||
(ice-9 ftw)))))
|
||||
(delete-file-recursively "deps") #t))
|
||||
(modules '((guix build utils)))))
|
||||
(build-system cmake-build-system)
|
||||
(outputs '("out" "debug"))
|
||||
(arguments
|
||||
`(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this
|
||||
"-DREGEX_BACKEND=pcre2")
|
||||
"-DREGEX_BACKEND=pcre2"
|
||||
"-DUSE_HTTP_PARSER=system")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-pcre2-reference
|
||||
|
@ -657,7 +647,8 @@ (define-public libgit2
|
|||
(replace 'check
|
||||
(lambda _ (invoke "./libgit2_clar" "-v" "-Q"))))))
|
||||
(inputs
|
||||
`(("libssh2" ,libssh2)))
|
||||
`(("libssh2" ,libssh2)
|
||||
("http-parser" ,http-parser)))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)
|
||||
("python" ,python)))
|
||||
|
|
Loading…
Reference in a new issue