From patchwork Mon Jul 8 09:58:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14516 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B60D2171D4; Mon, 8 Jul 2019 11:01:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 80D81171D2 for ; Mon, 8 Jul 2019 11:01:33 +0100 (BST) Received: from localhost ([::1]:40012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQSa-0005un-3t for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54973) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRX-0005Py-EF for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRS-00037l-Ae for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRS-00037Q-4Z for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRS-0004uB-1t for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 13/31] gnu: libgit2: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156257999018553 (code B ref 36477); Mon, 08 Jul 2019 10:00:13 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:50 +0000 Received: from localhost ([127.0.0.1]:57819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR3-0004p0-7C for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:49 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:37224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQv-0004ls-DB for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:42 -0400 Received: by mail-wm1-f44.google.com with SMTP id f17so15706144wme.2 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YfHtPssIiGkUPzH09rjZOx/HVJGAXh9FPXLWjE/0x7w=; b=nB91FOyM5FwuCIQkL+wWVvZMEsbdmquRMPKaC/wD75bGvDWKr/sULBy6GzpjedwW8J EHBdT5C3Ai5uUMErGRY9gJ0bVdRCuoN7z84HD6ooJfHFPWbMBYEagKOlIazXgNE0uj9x tUsxgSpSv90RTLt7UlPOmaR24qjF4D7ct9aFmVP2pC5rMLitOs6sGpD00hcd2cydpfCD ddg9zFpgOU8kE0DHClBVpIYE2bsVKnu4YfInueaVbWa83RM8DtBcmY9epJkQbsSMlOy/ x+nIvLQ4QMBfGhWKqCzV9Qif8bOrcxNGZz1ma5tU2POYIt8zNDnok4yDb9eBOMvX3xCM 4AAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YfHtPssIiGkUPzH09rjZOx/HVJGAXh9FPXLWjE/0x7w=; b=NVyHU5J66VtA8zYrXFZHPsDQD48NmP5Te7ZTBQuJNVea0vWZvlsE+jKm5oP571mzRp po/WlqsaC9BmGCtKY653uKiCliQzuipcLQIYGeG2rbh4gdsG2erKyKmy/p4/5TljkTwd e/F8+elTRi9txOfWjONL8LljN1d+ZUZRTZuQcFr53+TMQW/PxsAzFnS/yvNGr42mCHOz iIrLU+Hdr7HdJJmlqiErK7qscYZ0es11vwdnMDCmKSt8BivjIhAy47zz4O26quWgMVnA wGTt+lgjk4YB+te/18YapFgZIwlC24WyR2prDpiV0e6XDOXCEOJkhkVazd/vdv7mnz0k Ozuw== X-Gm-Message-State: APjAAAVGAQ/0pEDBdelYodBNSBfempYDICHqJz5YlaFHPKq1iKek+3gP Up7QwfHi27eF03DaQ8+GXcxqNh3w X-Google-Smtp-Source: APXvYqwNkNUb4vXkbTk+Vtb2oqHA9XYZtD645R45QHtZTgO63xuhG1eNA1uw/QO2ogcSF2ILA4Gm1w== X-Received: by 2002:a1c:1a4c:: with SMTP id a73mr11754317wma.109.1562579975431; Mon, 08 Jul 2019 02:59:35 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:34 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:58:55 +0200 Message-Id: <20190708095913.3460-14-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) + '((invoke "./libgit2_clar" "-v" "-Q")))))))) (inputs `(("libssh2" ,libssh2) ("http-parser" ,http-parser)))