From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39837) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkXn5-0008HN-7g for guix-patches@gnu.org; Mon, 08 Jul 2019 13:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkXn4-00064W-7o for guix-patches@gnu.org; Mon, 08 Jul 2019 13:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkXn4-00064H-3n for guix-patches@gnu.org; Mon, 08 Jul 2019 13:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkXn4-0005Ni-2F for guix-patches@gnu.org; Mon, 08 Jul 2019 13:51:02 -0400 Subject: [bug#36477] [PATCH 13/31] gnu: libgit2: Fix cross compilation. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20190708095913.3460-14-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> <20190708095913.3460-14-m.othacehe@gmail.com> Date: Mon, 08 Jul 2019 19:49:56 +0200 Message-ID: <874l3wpgaj.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Mathieu Othacehe , 36477@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Mathieu Othacehe 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-cont= rol.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 sp= eed and efficiency.") > (build-system cmake-build-system) > (outputs '("out" "debug")) > (arguments > - `(#:configure-flags '("-DUSE_SHA1DC=3DON") ; SHA-1 collision detect= ion > + `(#:configure-flags > + (list "-DUSE_SHA1DC=3DON" ; SHA-1 collision detection > + ,@(if (%current-target-system) > + `((string-append > + "-DPKG_CONFIG_EXECUTABLE=3D" > + (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 sp= eed 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))) > --=20 > 2.17.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl0jgkQACgkQoqBt8qM6 VPrnEQgAh40YQnjGRM+RjFvYoJXGLPSk9/o9Po8nBVOMBJpoMoETDJVqKk7KveG1 WKltfqQPBPSxFWYuy5Fj9D+gYuvsVLPL/3O3/QowZkpr1s+olBPrkmPMjROi4m21 ru8qJ7mjc2gDgXn2k6YyhZjq4EfnOc003GgWm+0j1fMGZbR9s4GEhJIZbYknk1uB 8N45u5tgikswgI4H5fJeTqd3Ep6AcoSXl1LXXRjCOlRDHJS7W5reTTyHej+23m49 mSz4Kv/hR+c8ij7wHz42AVD5AzvsOZYjm/7NYhPnNyL3ikbNIwdW2cGBdVWIZOOS 6tZlaT41rTQcKEU761xlQ+HbtplLfw== =zxck -----END PGP SIGNATURE----- --=-=-=--