diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/libgit2-path-max.patch | 16 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 7 |
3 files changed, 21 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 5b0f2b5e54..4e448e86ea 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1742,6 +1742,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgda-skip-postgresql-tests.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ + %D%/packages/patches/libgit2-path-max.patch \ %D%/packages/patches/libgit2-proxy-reconnection.patch \ %D%/packages/patches/libgit2-uninitialized-proxy-settings.patch \ %D%/packages/patches/libgnome-encoding.patch \ diff --git a/gnu/packages/patches/libgit2-path-max.patch b/gnu/packages/patches/libgit2-path-max.patch new file mode 100644 index 0000000000..8fc7f3c106 --- /dev/null +++ b/gnu/packages/patches/libgit2-path-max.patch @@ -0,0 +1,16 @@ +Work around lack of 'PATH_MAX' on the Hurd. +Submitted upstream: <https://github.com/libgit2/libgit2/pull/7100>. + +diff --git a/tests/clar/clar.h b/tests/clar/clar.h +index ca72292ae..98e2b14e8 100644 +--- a/tests/clar/clar.h ++++ b/tests/clar/clar.h +@@ -14,6 +14,8 @@ + # define CLAR_MAX_PATH 4096 + #elif defined(_WIN32) + # define CLAR_MAX_PATH MAX_PATH ++#elif !defined(PATH_MAX) /* GNU/Hurd */ ++# define CLAR_MAX_PATH 4096 + #else + # define CLAR_MAX_PATH PATH_MAX + #endif diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4aba67c536..ac85ebe104 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1392,7 +1392,7 @@ write native speed custom Git applications in any language with bindings.") (define-public libgit2-1.9 (package (inherit libgit2-1.8) - (version "1.9.0") + (version "1.9.1") (source (origin (inherit (package-source libgit2-1.8)) (uri (git-reference @@ -1401,10 +1401,11 @@ write native speed custom Git applications in any language with bindings.") (file-name (git-file-name "libgit2" version)) (patches (search-patches "libgit2-uninitialized-proxy-settings.patch" - "libgit2-proxy-reconnection.patch")) + "libgit2-proxy-reconnection.patch" + "libgit2-path-max.patch")) (sha256 (base32 - "06ajn5i5l1209z7x7jxcpw68ph0a6g3q67bmx0jm381rr8cb4zdz")))))) + "1k7h0phxz1i8i8qhd4dsyii62f30f33gmrpziqgri1ndnazkf4pz")))))) (define-public libgit2-1.6 (package |