From patchwork Mon May 2 18:24:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 39071 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 038DB27BBEA; Mon, 2 May 2022 19:25:41 +0100 (BST) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 6C29627BBE9 for ; Mon, 2 May 2022 19:25:40 +0100 (BST) Received: from localhost ([::1]:47702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlajr-0005fg-IZ for patchwork@mira.cbaines.net; Mon, 02 May 2022 14:25:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051L-SO for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44093) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajH-000160-7O for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlajH-0003Fe-3b for guix-patches@gnu.org; Mon, 02 May 2022 14:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 3/8] commencement: mes-boot: Update to 0.24, build with M2-Planet. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55227@debbugs.gnu.org Received: via spool by 55227-submit@debbugs.gnu.org id=B55227.165151589112411 (code B ref 55227); Mon, 02 May 2022 18:25:03 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:51 +0000 Received: from localhost ([127.0.0.1]:37978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaj4-0003E1-9e for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiw-0003Cv-8b for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlair-0000sc-2B; Mon, 02 May 2022 14:24:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=tHfPN02GlYHVNOQL5uG3tB4RfNuGJS46S/62nSFC2GE=; b=UbsM7aPXSAC2ZL26nRIn cdYS6Uk9EPwPnNcnv/hab2q/ZivL/qagyVyMxO3lqifHgwPS3J6mbYZ5/Hxvl727QMKkXVL1+wBTa AQ+ypgZDoyPj0PELf/ByduK5wED7UTHHc+0jfK6HMV30T23+CKtAm1VyVlCDcGq9FnvsT3LAi/7ko cAWbE0e84HNLnUtsYFmUgpmWEdikFGz+Zn1IWnkci/lSlUomYfk2ymPZ0IQxeDdTQ2wkbXv1bS00n zzXp+hdY3/E7vrvgLMiDXI3R51S42XvgI1o447OJIeJbJNRDejARZkIzV3ABy65F/UrK8A3PRNaoi wgutrjbjnWhEIw==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:48262 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1nlaiq-0006Dq-Mh; Mon, 02 May 2022 14:24:36 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:29 +0200 Message-Id: <20220502182434.32130-3-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502182434.32130-1-janneke@gnu.org> References: <20220502182434.32130-1-janneke@gnu.org> 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/commencement.scm (mes-boot)[source]: Update to 0.24. [native-inputs]: Add stage0-posix, remove %bootstrap-mescc-tools and %bootstrap-mes-rewired, and update nyacc to 1.00.2. --- gnu/packages/commencement.scm | 61 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 24e1e6ec8c..468a846e76 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -527,27 +527,28 @@ (define mes-boot (package (inherit mes) (name "mes-boot") - (version "0.22") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/mes/" - "mes-" version ".tar.gz")) - (sha256 - (base32 - "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) + (version "0.24") + (source (bootstrap-origin + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "00lrpm4x5qg0l840zhbf9mr67mqhp8gljcl24j5dy0y109gf32w2"))))) (inputs '()) (propagated-inputs '()) (native-inputs - `(("nyacc-source" ,(origin (inherit (package-source nyacc-0.99)) - (snippet #f))) - ("mes" ,%bootstrap-mes-rewired) - ("mescc-tools" ,%bootstrap-mescc-tools) + `(("m2-planet" ,stage0-posix) + ("nyacc-source" ,(bootstrap-origin + (origin (inherit (package-source nyacc-1.00.2)) + (snippet #f)))) ,@(%boot-gash-inputs))) (arguments `(#:implicit-inputs? #f #:tests? #f #:guile ,%bootstrap-guile - #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries + #:strip-binaries? #f ;no strip yet #:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-seeds @@ -556,44 +557,42 @@ (define mes-boot (with-directory-excursion ".." (invoke "tar" "-xvf" nyacc-source))))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out")) - (gash (assoc-ref %build-inputs "bash")) - (mes (assoc-ref %build-inputs "mes")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gash (assoc-ref inputs "bash")) + (mes (assoc-ref inputs "mes")) (dir (with-directory-excursion ".." (getcwd)))) - (setenv "AR" (string-append "gash " (getcwd) "/scripts/mesar")) - (setenv "BASH" (string-append gash "/bin/bash")) - (setenv "CC" (string-append mes "/bin/mescc")) - (setenv "GUILE_LOAD_PATH" - (string-append - mes "/share/mes/module" - ":" dir "/nyacc-0.99.0/module")) + (setenv "GUILE_LOAD_PATH" (string-append + dir "/nyacc-1.00.2/module")) (invoke "gash" "configure.sh" (string-append "--prefix=" out) - (string-append "--host=i686-linux-gnu"))))) + "--host=i686-linux-gnu")))) (replace 'build (lambda _ - (invoke "sh" "bootstrap.sh"))) + (invoke "gash" "bootstrap.sh"))) (delete 'check) (replace 'install - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (substitute* "install.sh" ; show some progress ((" -xf") " -xvf") (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd) (string-append space "echo '" cmd "'\n" space cmd "\n"))) - (invoke "sh" "install.sh") + (invoke "gash" "install.sh") ;; Keep ASCII output, for friendlier comparison and bisection - (let* ((out (assoc-ref %outputs "out")) + (let* ((out (assoc-ref outputs "out")) (cache (string-append out "/lib/cache"))) (define (objects-in-dir dir) (find-files dir (lambda (name stat) (and (equal? (dirname name) dir) - (or (string-suffix? ".o" name) + (or (string-suffix? ".M1" name) + (string-suffix? ".hex2" name) + (string-suffix? ".o" name) (string-suffix? ".s" name)))))) (for-each (lambda (x) (install-file x cache)) - (append (objects-in-dir ".") + (append (objects-in-dir "m2") + (objects-in-dir ".") (objects-in-dir "mescc-lib"))))))))) (native-search-paths (list (search-path-specification