diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2026-02-10 19:34:29 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-21 10:17:02 +0100 |
| commit | c581e8648eb0b4bd2796304bafae58fe320583a4 (patch) | |
| tree | 7a806f1185cfc5ed27a1d477124a7c1b10b635ed /gnu/packages | |
| parent | b21b1ec57662e6f0a342b610a2e68e8dafaeb036 (diff) | |
gnu: libgit2-1.9: Simplify configure-flags.
* gnu/packages/version-control.scm (libgit2-1.9)[arguments]: Remove the
workaround in the configure-flags.
Change-Id: Iffb3ddff86513dae69279cc4832cbdea8ac257d1
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/version-control.scm | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8480deff4e8..c9ddcb5ee05 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1193,19 +1193,22 @@ other git-like projects such as @code{libgit2}.") (outputs '("out" "debug")) (arguments `(#:configure-flags - ;; TODO: Simplify this to just be a list. It is only like this to - ;; avoid a large rebuild. - (map (lambda (arg) - (if (string= "-DUSE_HTTP_PARSER=system" arg) - "-DUSE_HTTP_PARSER=http-parser" - arg)) - (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this - "-DREGEX_BACKEND=pcre2" - "-DUSE_HTTP_PARSER=system" - "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing - ,@(if (target-32bit?) - '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64") - '()))) + (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this + "-DREGEX_BACKEND=pcre2" + "-DUSE_HTTP_PARSER=http-parser" + "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing + ,@(if (%current-target-system) + `((string-append + "-DPKG_CONFIG_EXECUTABLE=" + (search-input-file + %build-inputs + (string-append "/bin/" ,(%current-target-system) + "-pkg-config")))) + '()) + ;; See https://github.com/libgit2/libgit2/issues/7169 + ,@(if (target-32bit?) + '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64") + '())) #:phases (modify-phases %standard-phases ;; Run checks more verbosely, unless we are cross-compiling. |