diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-07-01 16:58:53 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-09-24 08:12:55 +0200 |
| commit | bc5ae287b75ea76ce4dfef2867ddb3dbf30735e5 (patch) | |
| tree | 487b8e8a9bbcb84ec0a7f3e7a5f1f55b1b490d7c /gnu/packages | |
| parent | 078784ce7c1ac5ed6483a00712b6c6badac8b2c9 (diff) | |
| download | guix-bc5ae287b75ea76ce4dfef2867ddb3dbf30735e5.tar guix-bc5ae287b75ea76ce4dfef2867ddb3dbf30735e5.tar.gz | |
gnu: libgit2: Fix cross compilation.
* gnu/packages/version-control.scm (libgit2)[arguments]: Set
PKG_CONFIG_EXECUTABLE variable when cross-compiling.
Also do not run test suite if cross-compiling.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/version-control.scm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 573fa6f8cc..192fa666d9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -545,7 +545,14 @@ everything from small to very large projects with speed and efficiency.") (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - `(#:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + `(#:configure-flags + (list "-DUSE_SHA1DC=ON" ; SHA-1 collision detection + ,@(if (%current-target-system) + `((string-append + "-DPKG_CONFIG_EXECUTABLE=" + (assoc-ref %build-inputs "pkg-config") + "/bin/" ,(%current-target-system) "-pkg-config")) + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-hardcoded-paths @@ -560,9 +567,13 @@ everything from small to very large projects with speed and efficiency.") (lambda _ (for-each make-file-writable (find-files ".")) #t)) - ;; Run checks more verbosely. + ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check - (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (invoke "./libgit2_clar" "-v" "-Q") + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%"))))))) (inputs `(("libssh2" ,libssh2) ("http-parser" ,http-parser))) |