Message ID | 20190821085455.18508-13-m.othacehe@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DE33D17264; Wed, 21 Aug 2019 10:10:06 +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 A55191724B for <patchwork@mira.cbaines.net>; Wed, 21 Aug 2019 10:10:06 +0100 (BST) Received: from localhost ([::1]:46010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1i0Md4-0000Rj-3f for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58647) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPc-0006gD-M6 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPb-0005I1-Gy for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPb-0005Hr-DI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPb-0006Ys-Ao for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 13/61] gnu: libgit2: Fix cross compilation. Resent-From: Mathieu Othacehe <m.othacehe@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:11 +0000 Resent-Message-ID: <handler.36477.B36477.156637772824753@debbugs.gnu.org> 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.156637772824753 (code B ref 36477); Wed, 21 Aug 2019 08:56:11 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:28 +0000 Received: from localhost ([127.0.0.1]:34586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1i0MOt-0006R0-GC for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <m.othacehe@gmail.com>) id 1i0MOi-0006Ng-Qa for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:17 -0400 Received: by mail-wm1-f68.google.com with SMTP id i63so1281323wmg.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:16 -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=bL8zYmAD1yBkH1onvChCQJY1hH5op4qwj4Xz/0COPDI=; b=Jwg1dR5rvna2tltrgH7iXnHYynz1BbZ7ELV4y0SD0BJ53wtUn9GbtTLMviFqNSPMpf s+IrbfDRq6d/1g0cxgmPFYEmjCIIrJXkswTgFKPTKtjNXtWEhKNQdGP9ZdtZUMtkYkW9 DNK6CQTQRQcmnXl0xIhTU0r6xYUaNOICpAq4QMIdddMNytYsS511HJ1Qja0X6gwv3lhu GT+nSdrOCnFzqke7JOxp9LnzdBCFspYqZ8CmPa5duG0sL40qT8bmlfSm+luie8grLHPH ejCeUFyMe0a3yjCm4HLaNvStbVIAu+aRinMRYeHdI964FkOVNSmp6ZEELJ6162aDe3Ib PmoQ== 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=bL8zYmAD1yBkH1onvChCQJY1hH5op4qwj4Xz/0COPDI=; b=HvmJqugiFeyxFA8zT0TBMY7EXdcBZiJwXXx7NKWiJdjaYW1tvUrZjd3D7pHTo2ePrX /RqrSQmSO1S1d+c22OMRJZzrPBaHwvvBuzaT6Gxjozv29GFvmcyZw9zLsjDDFIyQwfPq wDOTqfy222/m1i3oIfiqsyKkoEtW7Kdla6GGVsax71WHMmi/yuaUPz37DFYw6trbs/8j VlZjv+WuWK+3oY95XbaB37aiTTe4Qcn2pcDAKWQc5fz0SoYV6RptWXCQRvA765idusjh tKh3s+yRZim/CHDUFlHrLbZ8a2mzimUd5PTIeTctBeR5hbBgchiKD2ayZL4SY0TpYcrk rK3Q== X-Gm-Message-State: APjAAAWjOlVigmYjUZ3FTny+vKVTHeGjiH20nimIYGTNylymQkdoKUIh UhFHpI3hCPYF7RMZYSFji8W9xGjlLmc= X-Google-Smtp-Source: APXvYqwbn1aJKeseeM+mSzmNKYwl7aX1PY/hbTRyKYhHr0Qudaz6fDroEdc4HMRPy1UTDso3L4jUzA== X-Received: by 2002:a05:600c:254a:: with SMTP id e10mr4982513wma.113.1566377710869; Wed, 21 Aug 2019 01:55:10 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:10 -0700 (PDT) From: Mathieu Othacehe <m.othacehe@gmail.com> Date: Wed, 21 Aug 2019 10:54:07 +0200 Message-Id: <20190821085455.18508-13-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Cc: Mathieu Othacehe <m.othacehe@gmail.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
Add --target support to guix system
|
expand
|
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e83b1d95e3..0bc882d3d3 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)))