From patchwork Mon Nov 4 22:42:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 15967 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 0DC21176AE; Mon, 4 Nov 2019 22:43:41 +0000 (GMT) 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=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 C0BAD1768F for ; Mon, 4 Nov 2019 22:43:40 +0000 (GMT) Received: from localhost ([::1]:39278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRl4W-0005n7-4j for patchwork@mira.cbaines.net; Mon, 04 Nov 2019 17:43:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42795) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRl42-0005YF-Ab for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRl40-0006lJ-74 for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRl40-0006kv-3o for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iRl3z-000182-Bp for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38063] [PATCH 1/2] gnu: Add m2-planet. References: <87ftj3b71x.fsf@gnu.org> In-Reply-To: <87ftj3b71x.fsf@gnu.org> Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2019 22:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38063@debbugs.gnu.org Received: via spool by 38063-submit@debbugs.gnu.org id=B38063.15729073754309 (code B ref 38063); Mon, 04 Nov 2019 22:43:01 +0000 Received: (at 38063) by debbugs.gnu.org; 4 Nov 2019 22:42:55 +0000 Received: from localhost ([127.0.0.1]:37713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRl3n-00017Q-2i for submit@debbugs.gnu.org; Mon, 04 Nov 2019 17:42:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRl3l-000179-6M for 38063@debbugs.gnu.org; Mon, 04 Nov 2019 17:42:53 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRl3c-0006Jg-Sd; Mon, 04 Nov 2019 17:42:45 -0500 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=34496 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1iRl3c-0002sv-6J; Mon, 04 Nov 2019 17:42:44 -0500 From: Jan Nieuwenhuizen Date: Mon, 4 Nov 2019 23:42:42 +0100 Message-Id: <20191104224243.19953-1-janneke@gnu.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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 (m2-planet): New variable. --- gnu/packages/mes.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 3174c0c115..55d731d876 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -204,3 +204,35 @@ get_machine.") ((#:make-flags _) `(list (string-append "PREFIX=" (assoc-ref %outputs "out")) "CC=gcc")))))) + +(define-public m2-planet + (let ((commit "1fc2aeab483208bd2ba117b21df3894c182470ec") + (revision "0")) + (package + (name "m2-planet") + (version (string-append "1.4.0-" revision "." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oriansj/m2-planet.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fj3xiqcibdfi78b43nn6w8hs3vkz32yb06n8r5mna8pnjdmn00l")))) + (native-inputs + `(("mescc-tools" ,mescc-tools))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure)))) + (synopsis "The PLAtform NEutral Transpiler") + (description + "M2-Planet, The PLAtform NEutral Transpiler, when combined with +mescc-tools compiles a subset of the C language into working binaries +with introspective steps inbetween.") + (home-page "https://github.com/oriansj/m2-planet") + (license gpl3+)))) From patchwork Mon Nov 4 22:42:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 15968 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 B15D3176AE; Mon, 4 Nov 2019 22:43:45 +0000 (GMT) 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=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 4E6821768F for ; Mon, 4 Nov 2019 22:43:45 +0000 (GMT) Received: from localhost ([::1]:39280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRl4a-0005w1-Qv for patchwork@mira.cbaines.net; Mon, 04 Nov 2019 17:43:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42823) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iRl43-0005YR-5z for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iRl40-0006mO-Ot for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iRl40-0006lu-Lj for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iRl40-00018G-F4 for guix-patches@gnu.org; Mon, 04 Nov 2019 17:43:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38063] [PATCH 2/2] bootstrap: Add m2-planet-boot0. Resent-From: Jan Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Nov 2019 22:43:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38063 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38063@debbugs.gnu.org Received: via spool by 38063-submit@debbugs.gnu.org id=B38063.15729073874347 (code B ref 38063); Mon, 04 Nov 2019 22:43:08 +0000 Received: (at 38063) by debbugs.gnu.org; 4 Nov 2019 22:43:07 +0000 Received: from localhost ([127.0.0.1]:37715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRl3o-00017f-FV for submit@debbugs.gnu.org; Mon, 04 Nov 2019 17:43:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRl3l-00017A-7O for 38063@debbugs.gnu.org; Mon, 04 Nov 2019 17:42:56 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRl3d-0006K1-MK; Mon, 04 Nov 2019 17:42:47 -0500 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=34496 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1iRl3d-0002sv-7e; Mon, 04 Nov 2019 17:42:45 -0500 From: Jan Nieuwenhuizen Date: Mon, 4 Nov 2019 23:42:43 +0100 Message-Id: <20191104224243.19953-2-janneke@gnu.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191104224243.19953-1-janneke@gnu.org> References: <20191104224243.19953-1-janneke@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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/commencement.scm (m2-planet-boot0): New variable. --- gnu/packages/commencement.scm | 103 +++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 54746151ce..31722b4cf3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2017 Mark H Weaver ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -84,6 +84,107 @@ ;;; ;;; Code: +(define-public m2-planet-boot0 + ;; The soon-to-be initial bootstrap package: no binary inputs except for a + ;; ~500 byte binary seed: `x86/hex0-seed'. + (let* ((version "1.4.0") + (revision "0") + (commit "1fc2aeab483208bd2ba117b21df3894c182470ec") + (seed-version "Release_1.1") + (mescc-tools-version "Release_0.6.1") + (mes-m2-commit "f025a24b19e8447fb96ba1746bdad494ae63a514") + (mes-m2-version (string-append "0.19-" (string-take mes-m2-commit 7)))) + (package + (inherit m2-planet) + (name "m2-planet-boot0") + (version (string-append version "-" revision "." (string-take commit 7))) + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/oriansj/m2-planet" + "/archive/" commit ".tar.gz")) + (file-name (string-append "mescc-tools-seed-" version ".tar.gz")) + (sha256 + (base32 + "09dfbhrkfq754lkk9qqsa95rgfp5crdwy8l4db97qwfclr0y914z")))) + (inputs `(("mescc-tools-seed" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://github.com/oriansj/mescc-tools-seed" + "/archive/" seed-version ".tar.gz")) + (file-name (string-append "mescc-tools-seed-" seed-version + ".tar.gz")) + (sha256 + (base32 + "1ymkaanx3b9x8y3n4x0kpqxyjcql3gpv37hp1cbzvhwh89yqy6m4"))))) + ("mescc-tools-source" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://github.com/oriansj/mescc-tools" + "/archive/" mescc-tools-version ".tar.gz")) + (file-name (string-append "mescc-tools-" + mescc-tools-version + ".tar.gz")) + (sha256 + (base32 + "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n"))))) + ("mes-m2-source" + ,(bootstrap-origin + (origin + (method url-fetch) + (uri (string-append + "https://github.com/oriansj/mes-m2" + "/archive/" mes-m2-commit ".tar.gz")) + (file-name (string-append "mes-m2-" + mes-m2-version + ".tar.gz")) + (sha256 + (base32 + "092ydx21cms8rkgx5dfndxi4hrw9jqw9r266h4rsvycpv2lw6kp1"))))))) + (native-inputs + `(("coreutils" , %bootstrap-coreutils&co) + ("guile" , %bootstrap-guile))) + (supported-systems '("i686-linux" "x86_64-linux")) + (build-system trivial-build-system) + (arguments + `(#:guile ,%bootstrap-guile + #:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils)) + (let* ((mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed")) + (mescc-tools-source (assoc-ref %build-inputs "mescc-tools-source")) + (mes-m2-source (assoc-ref %build-inputs "mes-m2-source")) + (source (assoc-ref %build-inputs "source")) + (dir (string-append "mescc-tools-seed-" ,seed-version)) + (coreutils (assoc-ref %build-inputs "coreutils")) + (guile (assoc-ref %build-inputs "guile")) + (out (assoc-ref %outputs "out")) + (bindir (string-append out "/bin"))) + (setenv "PATH" (string-append coreutils "/bin")) + (invoke "tar" "--strip-components=1" "-xvf" mescc-tools-seed) + (invoke "tar" "--strip-components=1" "-C" "mescc-tools" "-xvf" mescc-tools-source) + (invoke "tar" "--strip-components=1" "-C" "M2-Planet" "-xvf" source) + (invoke "tar" "--strip-components=1" "-C" "mes-m2" "-xvf" mes-m2-source) + (mkdir-p bindir) + (with-directory-excursion "x86" + (invoke "../kaem-optional-seed" "--verbose" "--strict")) + (with-directory-excursion "bin" + (copy-file "mes-m2" "mes") + (install-file "hex2" bindir) + (install-file "M1" bindir) + (install-file "blood-elf" bindir) + (install-file "kaem" bindir) + (install-file "get_machine" bindir) + (install-file "get_machine" bindir) + (install-file "M2-Planet" bindir) + (install-file "mes" bindir) + (install-file "mes-m2" bindir)) + #t))))))) + (define mes-boot (package (inherit mes)