From patchwork Wed May 15 15:42:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 13988 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 6F65117006; Wed, 15 May 2019 16:58:47 +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 autolearn=ham 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 2866717004 for ; Wed, 15 May 2019 16:58:47 +0100 (BST) Received: from localhost ([127.0.0.1]:39028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQwIo-0005N2-Ja for patchwork@mira.cbaines.net; Wed, 15 May 2019 11:58:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQwGF-0003lD-2E for guix-patches@gnu.org; Wed, 15 May 2019 11:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQwGD-0003ex-2u for guix-patches@gnu.org; Wed, 15 May 2019 11:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQwGA-0003aD-VA for guix-patches@gnu.org; Wed, 15 May 2019 11:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hQwGA-0002HX-St for guix-patches@gnu.org; Wed, 15 May 2019 11:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35753] [PATCH] gnu: mes: Prepare for non-x86 architectures. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 May 2019 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35753@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15579357408727 (code B ref -1); Wed, 15 May 2019 15:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2019 15:55:40 +0000 Received: from localhost ([127.0.0.1]:53225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQwFo-0002Gh-01 for submit@debbugs.gnu.org; Wed, 15 May 2019 11:55:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQwFm-0002GV-Ey for submit@debbugs.gnu.org; Wed, 15 May 2019 11:55:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:49951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQwFb-0002bn-RS for submit@debbugs.gnu.org; Wed, 15 May 2019 11:55:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQwFZ-0002wS-BH for guix-patches@gnu.org; Wed, 15 May 2019 11:55:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQw2j-0005ea-23 for guix-patches@gnu.org; Wed, 15 May 2019 11:42:09 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:45754) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQw2h-0005UV-Bw for guix-patches@gnu.org; Wed, 15 May 2019 11:42:08 -0400 Received: from localhost.localdomain (212095005169.public.telering.at [212.95.5.169]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 26E5E3360DD1; Wed, 15 May 2019 17:42:03 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 15 May 2019 17:42:01 +0200 Message-Id: <20190515154201.31101-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Tags: patch X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mes.scm (mes)[native-inputs]: Prepare for non-x86 architectures. --- gnu/packages/mes.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index c45e267875..5c6b64150b 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -78,13 +78,16 @@ extensive examples, including parsers for the Javascript and C99 languages.") ("nyacc" ,nyacc))) (native-inputs `(("guile" ,guile-2.2) - ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) - (%current-system)))) + ,@(let ((target-system (or (%current-target-system) + (%current-system)))) + (cond + ((string-prefix? "x86_64-linux" target-system) ;; Use cross-compiler rather than #:system "i686-linux" to get ;; MesCC 64 bit .go files installed ready for use with Guile. `(("i686-linux-binutils" ,(cross-binutils triplet)) - ("i686-linux-gcc" ,(cross-gcc triplet))) - '()) + ("i686-linux-gcc" ,(cross-gcc triplet)))) + (else + '()))) ("graphviz" ,graphviz) ("help2man" ,help2man) ("perl" ,perl) ; build-aux/gitlog-to-changelog