From patchwork Wed Dec 1 15:54:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34923 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 B9E1827BBEA; Wed, 1 Dec 2021 16:09:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8520E27BBE9 for ; Wed, 1 Dec 2021 16:09:18 +0000 (GMT) Received: from localhost ([::1]:60238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msSAX-0006iN-Li for patchwork@mira.cbaines.net; Wed, 01 Dec 2021 11:09:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRxk-0000Uz-Q3 for guix-patches@gnu.org; Wed, 01 Dec 2021 10:56:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msRxk-0006bK-Hw for guix-patches@gnu.org; Wed, 01 Dec 2021 10:56:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msRxk-0005OL-Gy for guix-patches@gnu.org; Wed, 01 Dec 2021 10:56:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52186] [core-updates-frozen PATCH v2 15/17] gnu: julia-structarrays: Fix tests on i686-linux. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 15:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52186@debbugs.gnu.org Cc: efraim@flashner.co.il, maxim.cournoyer@gmail.com, zimoun Received: via spool by 52186-submit@debbugs.gnu.org id=B52186.163837411120613 (code B ref 52186); Wed, 01 Dec 2021 15:56:04 +0000 Received: (at 52186) by debbugs.gnu.org; 1 Dec 2021 15:55:11 +0000 Received: from localhost ([127.0.0.1]:45299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRwt-0005MK-Jy for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:55:11 -0500 Received: from mail-wr1-f44.google.com ([209.85.221.44]:40666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRwg-0005IW-4j for 52186@debbugs.gnu.org; Wed, 01 Dec 2021 10:54:59 -0500 Received: by mail-wr1-f44.google.com with SMTP id t9so36340296wrx.7 for <52186@debbugs.gnu.org>; Wed, 01 Dec 2021 07:54:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCvnN3MSr9RODE/ji9GeLxov0Wehmx5vbG5p2yqbC6s=; b=nk+zJdjgCkN+oSjYjwFfdTjPY/CIYGGtJKeiyK7M6l13dOT+pQeC60f+k7IPrXUkwF HtipKkz2ecoRVtjuozcWfVblcasYAfIEL5hWju9f4yVXGuLFNIPy+wzjqGmer/t+qv+i P56cSOprrMo3GxiFQwsWhVwmRLX6A5Wx8tqSN/iKa3FTRmM1RdYxx3qyrR6JnEqQiVGI QS+ErkbtgRZAOFtL0Jbi153aHbs1Jdt6iaEHnuMYw0QvI+dXBa8Gjb9yl4UjpKtypsH+ 1SWaRZ8r/x1nTf5I5NAE2ONjyEv47cDC5odtBfGaRrrZ5ylV9ltliji+d538+q6GQ3xV X4cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dCvnN3MSr9RODE/ji9GeLxov0Wehmx5vbG5p2yqbC6s=; b=SSpSTR7fiqAEZFoEc50jwDev6VO0wAg4BQgfuAkTS9EvASctaQhCPuOI/vdVLpcn4W 6q+WxSbj3230rUMz0X8b19Ew5tL+zUlCQoQf1v8Vddx33/jPvKVEE/C6ogm3pnvR3ls3 C5VanEHUCNSZ3/dSnGSbpTMUtF3JwtYSAtbOuhEOJCNcD2T0Y8C+zYJaAZiAxsCxW/aB EK/EFPkN3TpT3YwzsjZApoAiHL1TpbcqBXhrM2MHdm3dsVOhopm2ytSexroZU/ADJp8h 7D0wtv0/X3omdKUUXLLp8128rdcsWnlUMGDsGBVqWwRrjmCY5/prqycoeVnQ4h3BjKRJ +7pw== X-Gm-Message-State: AOAM531HDQOz+X44V0uaRU0HBnTXhgASp7cwblvIpRyXibKcxhrQ5RcN a45mRBfdR9m7Y3q+6JnWHH/kDCTTAy0= X-Google-Smtp-Source: ABdhPJz7mTjhFQohRb2OWBbeIj0NiwOOtHdK/YsXly9BfoJQgsWJrNfoX6uedb/EZwR19RkroxNUcw== X-Received: by 2002:a5d:6449:: with SMTP id d9mr7785815wrw.332.1638374092545; Wed, 01 Dec 2021 07:54:52 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id a10sm1419854wmq.27.2021.12.01.07.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 07:54:52 -0800 (PST) From: zimoun Date: Wed, 1 Dec 2021 16:54:40 +0100 Message-Id: <20211201155442.60916-6-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211201155442.60916-1-zimon.toutoune@gmail.com> References: <20211201155442.60916-1-zimon.toutoune@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/julia-xyz.scm (julia-structarrays)[arguments]<#:phases>: Conditionally replace the incorrect type in the test suite. --- gnu/packages/julia-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 363e7b5f11..02c652ce28 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -4616,6 +4616,17 @@ (define-public julia-structarrays (sha256 (base32 "0rjcpyjwzg70n87q5r9c5i1qzigavncslxssm3rk5a3y549py56v")))) (build-system julia-build-system) + (arguments + `(#:phases + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) + '((modify-phases %standard-phases + (add-after 'unpack 'fix-tests-int32-i686 + (lambda _ + (substitute* '("src/utils.jl" + "test/runtests.jl") + (("Int64") "Int32")))))) + '(%standard-phases)))) (propagated-inputs `(("julia-dataapi" ,julia-dataapi) ("julia-staticarrays" ,julia-staticarrays)