[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/19: gnu: libgit2: Fix cross compilation.
From: |
guix-commits |
Subject: |
13/19: gnu: libgit2: Fix cross compilation. |
Date: |
Wed, 3 Jul 2019 10:47:22 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 7f8899e35350f218e4d79038e1472428e060e3ab
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 | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8effe1d..ca5a019 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,12 @@ 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 _
+ ,@(if (%current-target-system)
+ '(#t)
+ '((invoke "./libgit2_clar" "-v" "-Q"))))))))
(inputs
`(("libssh2" ,libssh2)
("http-parser" ,http-parser)))
- branch wip-cross-system created (now a4afeb1), guix-commits, 2019/07/03
- 13/19: gnu: libgit2: Fix cross compilation.,
guix-commits <=
- 02/19: gnu: python: Fix cross compilation., guix-commits, 2019/07/03
- 06/19: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/07/03
- 15/19: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/07/03
- 07/19: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/07/03
- 10/19: gnu: openssl: Fix cross-compilation., guix-commits, 2019/07/03
- 14/19: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/07/03
- 04/19: gnu: tk: Fix cross-compilation., guix-commits, 2019/07/03
- 03/19: gnu: tcl: Fix cross-compilation., guix-commits, 2019/07/03
- 05/19: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/07/03
- 08/19: gnu: python: Fix cross-compilation., guix-commits, 2019/07/03