[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/64: gnu: libgit2: Fix cross compilation.
From: |
guix-commits |
Subject: |
13/64: gnu: libgit2: Fix cross compilation. |
Date: |
Fri, 23 Aug 2019 04:10:16 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 8b34be6729a0e75c0933510b609cb8b1102f1531
Author: Mathieu Othacehe <address@hidden>
Date: Mon Jul 1 16:58:53 2019 +0200
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.
---
gnu/packages/version-control.scm | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index e83b1d9..0bc882d 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)))
- 29/64: gnu: alsa-utils: Fix cross-compilation., (continued)
- 29/64: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/08/23
- 31/64: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/08/23
- 41/64: gnu: procps: Fix cross-compilation., guix-commits, 2019/08/23
- 45/64: gnu: libtool: Fix cross-compilation., guix-commits, 2019/08/23
- 47/64: packages: Set outputs field as thunked., guix-commits, 2019/08/23
- 44/64: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/23
- 05/64: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/08/23
- 03/64: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/23
- 09/64: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/23
- 10/64: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/23
- 13/64: gnu: libgit2: Fix cross compilation.,
guix-commits <=
- 11/64: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/08/23
- 27/64: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/08/23
- 24/64: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/08/23
- 28/64: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 35/64: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/08/23
- 38/64: gnu: swig: Fix cross-compilation., guix-commits, 2019/08/23
- 37/64: gnu: openldap: Fix cross-compilation., guix-commits, 2019/08/23
- 57/64: gnu: linux-libre: Enable built-in ext4 support., guix-commits, 2019/08/23
- 61/64: build: vm: Fix arm32 support., guix-commits, 2019/08/23
- 16/64: gnu: groff: Fix cross compilation., guix-commits, 2019/08/23