[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/61: gnu: libgit2: Fix cross compilation.
From: |
guix-commits |
Subject: |
13/61: gnu: libgit2: Fix cross compilation. |
Date: |
Wed, 21 Aug 2019 04:24:50 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 5d01fe99b39bfa677b17db7b665271d28245b406
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)))
- 11/61: gnu: texinfo: Fix cross-compilation., (continued)
- 11/61: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/08/21
- 12/61: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/21
- 10/61: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/21
- 09/61: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/21
- 07/61: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/08/21
- 14/61: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/21
- 08/61: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/21
- 01/61: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/21
- 03/61: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/21
- 02/61: gnu: python: Fix cross compilation., guix-commits, 2019/08/21
- 13/61: gnu: libgit2: Fix cross compilation.,
guix-commits <=
- 15/61: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 17/61: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/08/21
- 22/61: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/08/21
- 05/61: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/08/21
- 34/61: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/08/21
- 19/61: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 27/61: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/08/21
- 28/61: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 31/61: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/08/21
- 40/61: gnu: procps: Fix cross-compilation., guix-commits, 2019/08/21