From patchwork Wed May 15 16:53:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 13990 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 CDC9C17008; Wed, 15 May 2019 17:54:59 +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,URIBL_BLOCKED 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 4F6CB17006 for ; Wed, 15 May 2019 17:54:58 +0100 (BST) Received: from localhost ([127.0.0.1]:39853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQxBA-00068g-MW for patchwork@mira.cbaines.net; Wed, 15 May 2019 12:54:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQxAN-0005jc-3p for guix-patches@gnu.org; Wed, 15 May 2019 12:54:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQxAL-000063-2e for guix-patches@gnu.org; Wed, 15 May 2019 12:54:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQxAI-0008Ue-IH for guix-patches@gnu.org; Wed, 15 May 2019 12:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hQxAI-0003fx-A4 for guix-patches@gnu.org; Wed, 15 May 2019 12:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35753] [PATCH v2] 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 16:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35753@debbugs.gnu.org Received: via spool by 35753-submit@debbugs.gnu.org id=B35753.155793922314105 (code B ref 35753); Wed, 15 May 2019 16:54:02 +0000 Received: (at 35753) by debbugs.gnu.org; 15 May 2019 16:53:43 +0000 Received: from localhost ([127.0.0.1]:53273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQx9x-0003fQ-Ri for submit@debbugs.gnu.org; Wed, 15 May 2019 12:53:43 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:37156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hQx9v-0003fH-JJ for 35753@debbugs.gnu.org; Wed, 15 May 2019 12:53:40 -0400 Received: from localhost.localdomain (212095005169.public.telering.at [212.95.5.169]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 9CE4F33601B1; Wed, 15 May 2019 18:53:37 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 15 May 2019 18:53:36 +0200 Message-Id: <20190515165336.7816-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515154201.31101-1-dannym@scratchpost.org> References: <20190515154201.31101-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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 | 74 +++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index c45e267875..afb1e025b4 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -60,46 +60,48 @@ extensive examples, including parsers for the Javascript and C99 languages.") (license (list gpl3+ lgpl3+)))) (define-public mes - (let ((triplet "i686-unknown-linux-gnu")) - (package - (name "mes") - (version "0.19") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) - (sha256 - (base32 - "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) - (build-system gnu-build-system) - (supported-systems '("i686-linux" "x86_64-linux")) - (propagated-inputs - `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc))) - (native-inputs - `(("guile" ,guile-2.2) - ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) - (%current-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))) - '()) - ("graphviz" ,graphviz) - ("help2man" ,help2man) - ("perl" ,perl) ; build-aux/gitlog-to-changelog - ("texinfo" ,texinfo))) - (arguments - `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries - (synopsis "Scheme interpreter and C compiler for full source bootstrapping") - (description - "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed + (package + (name "mes") + (version "0.19") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) + (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux")) + (propagated-inputs + `(("mescc-tools" ,mescc-tools) + ("nyacc" ,nyacc))) + (native-inputs + `(("guile" ,guile-2.2) + ,@(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 "i686-unknown-linux-gnu")) + ("i686-linux-gcc" ,(cross-gcc "i686-unknown-linux-gnu")))) + (else + '()))) + ("graphviz" ,graphviz) + ("help2man" ,help2man) + ("perl" ,perl) ; build-aux/gitlog-to-changelog + ("texinfo" ,texinfo))) + (arguments + `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries + (synopsis "Scheme interpreter and C compiler for full source bootstrapping") + (description + "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed bootstrap to Guix and aims to help create full source bootstrapping for GNU/Linux distributions. It consists of a mutual self-hosting Scheme interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with Guile.") - (home-page "https://gnu.org/software/mes") - (license gpl3+)))) + (home-page "https://gnu.org/software/mes") + (license gpl3+))) (define-public mescc-tools (package