[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v2 13/61] gnu: libgit2: Fix cross compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v2 13/61] gnu: libgit2: Fix cross compilation. |
Date: |
Wed, 21 Aug 2019 10:54:07 +0200 |
* 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 e83b1d95e3..0bc882d3d3 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)))
--
2.17.1
- [bug#36477] [PATCH v2 02/61] gnu: python: Fix cross compilation., (continued)
- [bug#36477] [PATCH v2 02/61] gnu: python: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 04/61] gnu: tk: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 05/61] gnu: libxslt: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 07/61] gnu: libgpg-error: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 03/61] gnu: tcl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 06/61] gnu: xorg: Fix cross-compilation of multiple packages., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 08/61] gnu: python: Further cross-compilation fixes., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 11/61] gnu: texinfo: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 09/61] gnu: http-parser: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 12/61] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 13/61] gnu: libgit2: Fix cross compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v2 10/61] gnu: openssl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 14/61] gnu: ath9k-htc-firmware: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 15/61] gnu: libpaper: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 16/61] gnu: groff: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 19/61] gnu: indent: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 21/61] gnu: mit-krb5: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 17/61] gnu: texinfo-5: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 22/61] gnu: cyrus-sasl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 23/61] gnu: help2man: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 20/61] gnu: libsamplerate: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/08/21