[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH 13/31] gnu: libgit2: Fix cross compilation.
From: |
Marius Bakke |
Subject: |
[bug#36477] [PATCH 13/31] gnu: libgit2: Fix cross compilation. |
Date: |
Mon, 08 Jul 2019 19:49:56 +0200 |
User-agent: |
Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) |
Mathieu Othacehe <address@hidden> writes:
> * 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 8effe1d502..ca5a019105 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)
Maybe print "test suite not run" or something like that. Otherwise LGTM.
> + '((invoke "./libgit2_clar" "-v" "-Q"))))))))
> (inputs
> `(("libssh2" ,libssh2)
> ("http-parser" ,http-parser)))
> --
> 2.17.1
signature.asc
Description: PGP signature
[bug#36477] [PATCH 22/31] gnu: cyrus-sasl: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 24/31] gnu: xmlto: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 20/31] gnu: libsamplerate: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 30/31] gnu: icu4c: Fix cross-compilation., Mathieu Othacehe, 2019/07/08