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 | |
| 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')
| -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}.") | |||
| 1193 | (outputs '("out" "debug")) | 1193 | (outputs '("out" "debug")) |
| 1194 | (arguments | 1194 | (arguments |
| 1195 | `(#:configure-flags | 1195 | `(#:configure-flags |
| 1196 | ;; TODO: Simplify this to just be a list. It is only like this to | 1196 | (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this |
| 1197 | ;; avoid a large rebuild. | 1197 | "-DREGEX_BACKEND=pcre2" |
| 1198 | (map (lambda (arg) | 1198 | "-DUSE_HTTP_PARSER=http-parser" |
| 1199 | (if (string= "-DUSE_HTTP_PARSER=system" arg) | 1199 | "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing |
| 1200 | "-DUSE_HTTP_PARSER=http-parser" | 1200 | ,@(if (%current-target-system) |
| 1201 | arg)) | 1201 | `((string-append |
| 1202 | (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this | 1202 | "-DPKG_CONFIG_EXECUTABLE=" |
| 1203 | "-DREGEX_BACKEND=pcre2" | 1203 | (search-input-file |
| 1204 | "-DUSE_HTTP_PARSER=system" | 1204 | %build-inputs |
| 1205 | "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing | 1205 | (string-append "/bin/" ,(%current-target-system) |
| 1206 | ,@(if (target-32bit?) | 1206 | "-pkg-config")))) |
| 1207 | '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64") | 1207 | '()) |
| 1208 | '()))) | 1208 | ;; See https://github.com/libgit2/libgit2/issues/7169 |
| 1209 | ,@(if (target-32bit?) | ||
| 1210 | '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64") | ||
| 1211 | '())) | ||
| 1209 | #:phases | 1212 | #:phases |
| 1210 | (modify-phases %standard-phases | 1213 | (modify-phases %standard-phases |
| 1211 | ;; Run checks more verbosely, unless we are cross-compiling. | 1214 | ;; Run checks more verbosely, unless we are cross-compiling. |