From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id CP/2KRMicGL4kgAAbAwnHQ (envelope-from ) for ; Mon, 02 May 2022 20:25:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uOEKKRMicGJKggEAG6o9tA (envelope-from ) for ; Mon, 02 May 2022 20:25:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5288324CFB for ; Mon, 2 May 2022 20:25:23 +0200 (CEST) Received: from localhost ([::1]:46782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlaja-00052y-34 for larch@yhetil.org; Mon, 02 May 2022 14:25:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00051P-W9 for guix-patches@gnu.org; Mon, 02 May 2022 14:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlajJ-00016F-Io 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 1nlajJ-0003GF-FW for guix-patches@gnu.org; Mon, 02 May 2022 14:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55227] [PATCH core-updates 7/8] commencement: Remove %bootstrap-mes-rewired. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 May 2022 18:25:05 +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.165151589812466 (code B ref 55227); Mon, 02 May 2022 18:25:05 +0000 Received: (at 55227) by debbugs.gnu.org; 2 May 2022 18:24:58 +0000 Received: from localhost ([127.0.0.1]:37988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlajC-0003Ev-7P for submit@debbugs.gnu.org; Mon, 02 May 2022 14:24:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlaiy-0003D3-LY for 55227@debbugs.gnu.org; Mon, 02 May 2022 14:24:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlait-0000t5-Es; Mon, 02 May 2022 14:24: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=cIr9hTG5K5LHbtR7alw5BeviehUb3UixB9bxj90sm/w=; b=Th+elYrxHL47c6cDA/Km 9TbMXqzt/jG3R1vNWLP5KwqJu+JDyRcoWYoi0+aWOtOJJm1T/VCcgn17L9EFO/97PBCcwb3alsUOv fIi6LFosHiEzZ5UAy91GnVAgr0KwfcjtPo509g/dDBvuHm8JRD3ROrti9ZUDnTi0peLBoLnhUqWST npzVzsMKKOF7RIkuaNxwo4Fs1+KalMigw+2ziMLJQbr3DdRw+q9jlwgG+EDltwDpG+7cflCB/oFKm DJWrN0hZvFnlYGmgTxKIL6y2LLZrMTxCZjdJFpw8PxJBEtKsM5OsfOsLQaa69tqdHPKwBmKqWPJMr Egmw1pE4zP0ZdA==; 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 1nlait-0006Dq-3J; Mon, 02 May 2022 14:24:39 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 20:24:33 +0200 Message-Id: <20220502182434.32130-7-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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651515923; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cIr9hTG5K5LHbtR7alw5BeviehUb3UixB9bxj90sm/w=; b=nUXEJxf9yrWnHAQ3nCk9AB4cRU64t8NK9oAIQkVJG+BAl6iG3CpquO+0B+w5a3mWHb3xrg fcGmhmM1L7Sr3Lwi0YZK7XcqAfeGmsKZgem/Tpt+NdUumE0A9NuNVeD3p86HGpFaunPane /8Ua3/E1wTt5Bumvx/B+PStwIbpMWeoSPW0Y0IxQ1gH1owZge0Gu4H0i3zwu/3wlrZhdxh JghrZd4bvg7kUijPug7P9hWYU9z0MAoWM91V5e82zR87V2mZs6gPL88rE/AzNyrNSn/yYf qG0jALDvDyB2BrPiqGIGCmvR/Dmz8GmJtGtsTVu+0UJ7lLjK0wCE14+xbYQZmw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651515923; a=rsa-sha256; cv=none; b=jSuQ/Lem8DruYLBFaJRi7rAJFx/dndNHuAGNZEZ2/2VsiD7ioDfU9/VxrOelc3HtUcecNP ODis+dyn6hwEbrtSWSBzOWYCmF/CuDlXfiXy33WRovrzgpwwfv5a3H/BH7i93e4iumf4WK Gm++1NAZQQr3GHjLdd7KVrsSFNxzIKw8XV0CyHQHQau4kSefp6bRF/NSPmz/mWeDZ1AXbD /p215O13r/4bsh7z0n2OFBRs64SNkDQztjo8X6Q5VtGbDSvJbNVefl9ZN01rNCUPSqsIZ+ ovBUBKBpSEYd6ytEYBSB24P3O746m5M0AbdYrXfVBMu69RXagBLyR8nMhM/U6g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Th+elYrx; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.88 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Th+elYrx; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 5288324CFB X-Spam-Score: -0.88 X-Migadu-Scanner: scn1.migadu.com X-TUID: hyH/Fpg2ikPj * 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 8b8b243754..ffc8a5dd37 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -415,114 +415,6 @@ (define stage0-posix M2, get_machine, (mescc-tools), and 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) -- 2.35.1