From patchwork Wed Aug 21 08:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15106 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 E3E5C17264; Wed, 21 Aug 2019 10:03:42 +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 985D01724B for ; Wed, 21 Aug 2019 10:03:42 +0100 (BST) Received: from localhost ([::1]:45850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MWr-0008LJ-SI for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:03:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59221) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQY-0008FG-Ey for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQW-0005uV-E1 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQV-0005s6-7g for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQV-0006hU-2z for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 44/61] gnu: libtool: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57:07 +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.156637779725540 (code B ref 36477); Wed, 21 Aug 2019 08:57:07 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:37 +0000 Received: from localhost ([127.0.0.1]:34722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ1-0006dl-AJ for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:37 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPA-0006TM-Nf for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:50 -0400 Received: by mail-wr1-f68.google.com with SMTP id c3so1227831wrd.7 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:44 -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=C4uD20lBlAX3OpnirmWezE1O3QCbZhWRYvt3ogEWxDw=; b=ivmn8S3ml0P0yozsS3JM0/KX6pLQTZ9/VgK0ggz6rUVunYxkw3PD6WlIIwoNDL1IHg CxT8PaB9+DjfG4X9aTtOigPnuQ7yCFtTAljj7KSMRkHYzCWxESXvUEPo1MJx0/Bya3L1 jO5lf8D6EbrLiwiIGd1iSQMmtRg1PsvmkX8LY+4VDE4hgbgEnNfUFmBIyCY/nZto/DCy dD4nqLWIj+RnJITfqSHflJduCpotXeHjlMpGhPsFHYaIZbVYPabMQZfVOWvWPBJDKcbV RkeaOzMCcTKvSGwNwsJQsRXrBNgnLFtxKBZ+CysTfsoiPC2EBjkMquR8p0gT2N/V6u27 1xiQ== 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=C4uD20lBlAX3OpnirmWezE1O3QCbZhWRYvt3ogEWxDw=; b=mQ2jUp1LxShd1MJh22AklK6GCsNj5/Ha0/s9AI0WSg9c8IappJ454qGAPQPVmvaKoa gs9OQuXYx7q7rXGR83MXOQREg4nHNPBOlffuugtNrOZgq3CmZmvpJWzEqn3gflaoGzZr 4isURaq2HI5OAP8vyv/N9AlozYkM2qmKrsaL5Bl6wgtXIaHbHJe+/0bCbTIT32X7vatV Nax73E0ZlQUMxWZmavMGbeqCOhexI20bF3ZIvObKhMzc6fKIoHDOydE8xN0l0L+GggbD e1FHFfZZA8+Z8QJVrDyMQVSPuCPfa8eMu6KBy32zWWtn2E4s/sl1XUmhRKhORaZQYBK/ ot8g== X-Gm-Message-State: APjAAAVmrecY0oi9nOnm0gjce17Mxl/BBa5TArPN867x5zIgbKGIu7W9 0N1IhwxLDepGI0NmbbBWa4D/vpu3H80= X-Google-Smtp-Source: APXvYqyXJDjeiQUfScnnI09lD+CZwogOynD/Oc1vld21FA7oMDJtKotXGiEQ215xhPLeUCfO0akHkQ== X-Received: by 2002:adf:f584:: with SMTP id f4mr9168401wro.160.1566377738802; Wed, 21 Aug 2019 01:55:38 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:38 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:38 +0200 Message-Id: <20190821085455.18508-44-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> 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")))