From patchwork Mon Sep 2 15:33:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15260 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 D45B71734D; Mon, 2 Sep 2019 16:38:44 +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,URIBL_BLOCKED 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 5F19517329 for ; Mon, 2 Sep 2019 16:38:44 +0100 (BST) Received: from localhost ([::1]:37684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPj-000602-T9 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42656) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMH-0002GV-Sn for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMG-0004RZ-BE for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50033) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMG-0004Qc-6V for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMG-0006dX-23 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:08 +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.156743847325183 (code B ref 36477); Mon, 02 Sep 2019 15:35:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:33 +0000 Received: from localhost ([127.0.0.1]:58788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLh-0006Xn-8d for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:33 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:33295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLR-0006Tj-Aj for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:18 -0400 Received: by mail-wm1-f68.google.com with SMTP id r17so12227703wme.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:17 -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 :mime-version:content-transfer-encoding; bh=6rgnidP1c1WnyztbQAYAHBDpHNviswxFnrUVkVp3c9U=; b=Js9rjFKUm+pHIRuCPgFIPt8bdaAk9E8o51NNKm1pkZJG7KrovwdaOSqSynQwEfn/EA WxkNoHdZUTXOj+AeWVKr1hzOQIzj7Vq6mEuHi9Fo/bl9phft4KJKs0Cfw7lM0PXD+RLT /Azy3yzYw/TaYKXH++kcjxGreEe2D/GzRTJLbxIdopNQLtgUA/6gWIhBVg1GQw5Yvi23 kShxIBLky2jy3c/15FqVY06pd0wPZ6vWhSbVgsz2eMjl3ufYk6GtDB+Pb8efdESie9Hv AogEvvesj+0eGlVHYNXhpjvbd8b4XfSrhrRMpmjo0TQt149M6Ui5ctpFvGv7GBe/8S74 nSYQ== 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:mime-version:content-transfer-encoding; bh=6rgnidP1c1WnyztbQAYAHBDpHNviswxFnrUVkVp3c9U=; b=W1g5KOQe9qNo+rqKr0a5PiolyOvKW+tWfTLwWTVYUtb7ImxnCC89C2lQkXdKLKwCtX 9RTLL3da+HyDKep7C3OPvbWCj/uZMbZJg4SOlScBYKQ+HhIThZmPCw1w9CPY1bU+PG2E O4tth1en9bCUrBscuylwxqXW1uOutFOz/WjkUrpMnGnfldl0Og0kRwvZrcTf3LYZxfju cz/OQT3dcy5k10k3XF+79qQLB5sVjeEx/g5aS6QMinXcOcbIkdeMfKm50NI27avjNdB8 Ki/h4ObwqN+yk8KwPNDeCrElEY66EBJiAAC+q3VaLb91pjBGKC8A1BNb1DKSoj9bZP+I K9oA== X-Gm-Message-State: APjAAAWYg0DtHbxHFrq36K3wJkwRj0iyjOLTdrfFpsW3d8V9PYae5h9J 2H35t/uOLohx26AdkpROyX42Q8lp X-Google-Smtp-Source: APXvYqxIJjzI95JG4X1FoEfb/M9AGGJwW62dSrwytdN36Wh10tJ4jjOioe7ok7778mlVxmo0RdqGFQ== X-Received: by 2002:a1c:9a46:: with SMTP id c67mr8143431wme.115.1567438451613; Mon, 02 Sep 2019 08:34:11 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:11 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:13 +0200 Message-Id: <20190902153333.11190-29-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-1-m.othacehe@gmail.com> MIME-Version: 1.0 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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/autotools.scm (libtool)[arguments]: Do not run tests and use bash from native-inputs when cross-compiling. --- gnu/packages/autotools.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index ceb70dfee7..98f31f6bca 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -354,21 +355,22 @@ Makefile, simplifying the entire process for the developer.") ;; XXX: There are test failures on mips64el-linux starting from 2.4.4: ;; . - #:tests? ,(not (string-prefix? "mips64" - (or (%current-target-system) + ;; Also, do not run tests when cross compiling + #:tests? ,(not (or (%current-target-system) + (string-prefix? "mips64" (%current-system)))) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; Run the test suite in parallel, if possible. (setenv "TESTSUITEFLAGS" (string-append "-j" (number->string (parallel-job-count)))) ;; Patch references to /bin/sh. - (let ((bash (assoc-ref inputs "bash"))) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) (substitute* "tests/testsuite" (("/bin/sh") (string-append bash "/bin/sh")))