From patchwork Fri May 13 15:36:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 2307 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 0241127BBEA; Fri, 13 May 2022 16:39:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 7B59627BBE9 for ; Fri, 13 May 2022 16:39:49 +0100 (BST) Received: from localhost ([::1]:41322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1npXOO-00028c-Ll for patchwork@mira.cbaines.net; Fri, 13 May 2022 11:39:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npXMi-0000WK-36 for guix-patches@gnu.org; Fri, 13 May 2022 11:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npXMh-0007M0-Oe for guix-patches@gnu.org; Fri, 13 May 2022 11:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1npXMh-0003JJ-Md for guix-patches@gnu.org; Fri, 13 May 2022 11:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates v3 7/8] gnu: commencement: Remove %bootstrap-mes-rewired. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 May 2022 15:38: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.165245622512565 (code B ref 55227); Fri, 13 May 2022 15:38:03 +0000 Received: (at 55227) by debbugs.gnu.org; 13 May 2022 15:37:05 +0000 Received: from localhost ([127.0.0.1]:44693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npXLk-0003GV-Fh for submit@debbugs.gnu.org; Fri, 13 May 2022 11:37:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1npXLR-0003E3-61 for 55227@debbugs.gnu.org; Fri, 13 May 2022 11:36:57 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npXLL-0007Gb-UY; Fri, 13 May 2022 11:36:39 -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=up3BefH1fcXcUbh/r+ZCFghEItlwlSCVDiSLqJmb1HM=; b=GN1f3CFpaItvdej9BfB5 L4v5y+gz+4yRolbZIKe1Qds/DjltwASPxA0e5NBxETDeHuc2F3YLX5J3psUaZI+1TwL9pmNb1VmP7 sM/5DZhBdAf7bmf0ocbrLgjbwFYujXkGBl8lkVRsyNsrgGhv/tp6yvrJh1VN7DEDk55oE2iJIRE+z 4IDMUqo7ewya0bT+S4//f9pIzBFwlEHMuZWZXB/19GbCu+T+Qu7ew75+wirpth8Y4KJadzqasVFjV F1AgX2YtbvCGWxIdOOpe13R2DNwks8h6uHdYNMpx5+sKMw+sL76gi9cB0nYX0yfZv6CtTZ/8Nvqgy oFnU/69Zl6XHVQ==; Received: from 2a02-a462-da03-1-fa3e-1174-c33f-9485.fixed6.kpn.net ([2a02:a462:da03:1:fa3e:1174:c33f:9485]:47912 helo=drakenbij.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1npXLL-0006qU-Gv; Fri, 13 May 2022 11:36:39 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 13 May 2022 17:36:30 +0200 Message-Id: <20220513153631.13052-7-janneke@gnu.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220513153631.13052-1-janneke@gnu.org> References: <20220513153631.13052-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 (%bootstrap-mes-rewired): Remove. --- gnu/packages/commencement.scm | 108 ---------------------------------- 1 file changed, 108 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d01b0ef8c9..0390c43023 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -423,114 +423,6 @@ (define stage0-posix MesCC-Tools), and finally M2-Planet.") (license license:gpl3+)))) -(define %bootstrap-mes-rewired - (package - (inherit mes) - (name "bootstrap-mes-rewired") - (version "0.19") - (source #f) - (native-inputs `(("mes" ,%bootstrap-mes) - ("gash" ,gash-boot))) - (inputs '()) - (propagated-inputs '()) - (outputs '("out")) - (build-system trivial-build-system) - (arguments - `(#:guile ,%bootstrap-guile - #:modules ((guix build utils)) - - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((mes (assoc-ref %build-inputs "mes")) - (gash (assoc-ref %build-inputs "gash")) - (mes-bin (string-append mes "/bin")) - (guile (string-append mes-bin "/mes")) - (mes-module (string-append mes "/share/mes/module")) - (out (assoc-ref %outputs "out")) - (bin (string-append out "/bin")) - (mescc (string-append bin "/mescc")) - (module (string-append out "/share/mes/module"))) - (define (rewire file) - (substitute* file - ((mes) out) - (("/gnu/store[^ ]+mes-minimal-[^/)}\"]*") out) - (("/gnu/store[^ ]+guile-[^/]*/bin/guile") guile) - (("/gnu/store[^ ]+bash-[^/)}\"]*") gash))) - - (mkdir-p bin) - (for-each (lambda (file) (install-file file bin)) - (find-files mes-bin)) - (mkdir-p module) - (copy-recursively (string-append mes-module "/mes") - (string-append module "/mes")) - (copy-recursively (string-append mes-module "/srfi") - (string-append module "/srfi")) - (for-each rewire - ;; Cannot easily rewire "mes" because it - ;; contains NUL characters; would require - ;; remove-store-references alike trick - (filter (negate (cut string-suffix? "/mes" <>)) - (find-files bin))) - (rewire (string-append module "/mes/boot-0.scm")) - - (delete-file mescc) - (with-output-to-file mescc - (lambda _ - (display (string-append - "\ -#! " gash "/bin/sh -LANG=C -LC_ALL=C -export LANG LC_ALL - -MES_PREFIX=${MES_REWIRED_PREFIX-" out "/share/mes} -MES=" bin "/mes -export MES MES_PREFIX - -MES_ARENA=${MES_REWIRED_ARENA-10000000} -MES_MAX_ARENA=${MES_REWIRED_ARENA-10000000} -MES_STACK=${MES_REWIRED_STACK-1000000} -export MES_ARENA MES_MAX_ARENA MES_STACK - -$MES -e '(mescc)' module/mescc.scm -- \"$@\" -")))) - (chmod mescc #o555) - - (with-directory-excursion module - (chmod "mes/base.mes" #o644) - (copy-file "mes/base.mes" "mes/base.mes.orig") - (let ((base.mes (open-file "mes/base.mes" "a"))) - (display " -;; A fixed map, from Mes 0.21, required to bootstrap Mes 0.21 -(define (map f h . t) - (if (or (null? h) - (and (pair? t) (null? (car t))) - (and (pair? t) (pair? (cdr t)) (null? (cadr t)))) '() - (if (null? t) (cons (f (car h)) (map f (cdr h))) - (if (null? (cdr t)) - (cons (f (car h) (caar t)) (map f (cdr h) (cdar t))) - (if (null? (cddr t)) - (cons (f (car h) (caar t) (caadr t)) (map f (cdr h) (cdar t) (cdadr t))) - (error 'unsupported (cons* 'map-4: f h t))b ))))) -" base.mes) - (close base.mes)) - - (chmod "mes/guile.mes" #o644) - (copy-file "mes/guile.mes" "mes/guile.mes.orig") - (let ((guile.mes (open-file "mes/guile.mes" "a"))) - (display " -;; After booting guile.scm; use Mes 0.21; especially: MesCC 0.21 -(let* ((self (car (command-line))) - (prefix (dirname (dirname self)))) - (set! %moduledir (string-append prefix \"/mes/module/\")) - (setenv \"%numbered_arch\" \"true\")) - -" guile.mes) - (close guile.mes))) - #t)))))) - (define mes-boot (package (inherit mes)