From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 0/5] Use Guile 3.0 in the initrd Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158801164917247 (code B ref -1); Mon, 27 Apr 2020 18:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Apr 2020 18:20:49 +0000 Received: from localhost ([127.0.0.1]:38074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8N4-0004U4-En for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:20:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:35327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Mw-0004Tq-VU for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:20:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35356) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT8Mv-0006dy-8D for guix-patches@gnu.org; Mon, 27 Apr 2020 14:20:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT8Mr-0001TA-Aj for guix-patches@gnu.org; Mon, 27 Apr 2020 14:20:37 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:55623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jT8Mq-0001EJ-Fy for guix-patches@gnu.org; Mon, 27 Apr 2020 14:20:32 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6D8D476C for ; Mon, 27 Apr 2020 14:20:29 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:20:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=jQc9hKr22dKEq9rIjYinjfuA9+ eT6ohNqp3vC+gC+Vs=; b=JWOcHrXYXrRtE0Jah0CN9I3yec+P+o6n+hc/OO+A7z 63ekCxc3QOtuhUSfiMa56vKNWdqS5us/hAytX1nqzjJhN9UOYMVdver09xi63JvJ VHOBwZOFyLvtD6pReaaFI4ZM+etSRfTitw87F91nTWV4JTvCjOI7dThwNQ2P6DyQ vRBX6wwkVDWz1HNZmwM3IUF0kcUiEvv62L7SwxE7NuBT+nLXBfLrJmTWf/7jvSnF R7vl8ZFVMdIl3hjZqUJLrnErT/wS398nypfHhBKe6rfZ/csf4ewJg/h2qQibRKjJ 3u9FUYHzr8HWFQx53xZrSB/T1Hy0t2CQZZ1vYywOf5oA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=jQc9hKr22dKEq9rIj YinjfuA9+eT6ohNqp3vC+gC+Vs=; b=af8kTI0dyp/A8ZtDdTRRjA5jtRREdyB54 dHsIajkF+78LnWO4txngVI+phmQJqEpQxIemdlEsVUNstTvVFmJJazWTO9abI0de KG7GmKDVB2Iv1x+NBhzmZlYehye4EUm0tBANHunUqEqECNQg3/J3S8tRS+qhYrb3 aaT0fVa97IxjanmA4p1E8DHBU9GFJ7PHYOX2xY0mudPQMefYfclB5Wcb0CNYCa9v oER8oRm5yxwVQeacK0XCr3nER8P8LKxSvb51xVI+J05w8OC3XK8vhGnRX2PR4Mre fLHP0uq3uFqavsXHhSK2x6jKw5Fq6fQUiGYpleZ1mF0jqQtF6NhHg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhm rghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgr ihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id AC4AA3065E77 for ; Mon, 27 Apr 2020 14:20:28 -0400 (EDT) From: Marius Bakke Date: Mon, 27 Apr 2020 20:20:27 +0200 Message-Id: <20200427182027.27813-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.25; envelope-from=mbakke@fastmail.com; helo=wout2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 14:20:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.123.25 X-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Guix, These patches changes the initrd to use Guile 3.0. By default it uses %GUILE-STATIC-STRIPPED from (gnu packages make-bootstrap), which on the core-updates branch refers to Guile 2.0. It is suboptimal to define this new static Guile variant straight in (gnu system linux-initrd), but adding it to (gnu packages guile) would cause a cyclic module reference with (gnu packages make-bootstrap). WDYT? Marius Bakke (5): gnu: %guile-static: Rewrite in terms of 'make-guile-static'. gnu: %guile-static-stripped: Rewrite in terms of 'make-guile-static-stripped'. gnu: make-bootstrap: Export MAKE-GUILE-STATIC and MAKE-GUILE-STATIC-STRIPPED. linux-initrd: Use Guile 3.0. gnu: make-bootstrap: Do not export %GUILE-STATIC-STRIPPED. gnu/local.mk | 7 +- gnu/packages/make-bootstrap.scm | 161 ++++---- .../patches/guile-2.2-default-utf8.patch | 82 ++++ .../patches/guile-3.0-linux-syscalls.patch | 353 ++++++++++++++++++ .../patches/guile-3.0-relocatable.patch | 79 ++++ gnu/system/linux-initrd.scm | 10 +- 6 files changed, 611 insertions(+), 81 deletions(-) create mode 100644 gnu/packages/patches/guile-2.2-default-utf8.patch create mode 100644 gnu/packages/patches/guile-3.0-linux-syscalls.patch create mode 100644 gnu/packages/patches/guile-3.0-relocatable.patch -- 2.26.2 From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 2/5] gnu: %guile-static-stripped: Rewrite in terms of 'make-guile-static-stripped'. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158801176517523 (code B ref 40908); Mon, 27 Apr 2020 18:23:01 +0000 Received: (at 40908) by debbugs.gnu.org; 27 Apr 2020 18:22:45 +0000 Received: from localhost ([127.0.0.1]:38098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Oz-0004YX-CX for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:45 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:37043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Om-0004Xn-2H for 40908@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:44 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 5677D338 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:22:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=m6KPWyznNgWC/ glCCzkSUC1tyF3aM/1+InUGD3SPOyA=; b=Ydkoy3vYye0gFz0egrdUvTCBTgO// lvh3t863N2Q/DTDBw/AgvH6a+wHJPU825xS4G8RJ468702EXqJ+KGIljLjptkrfj mQPsxoWzxCozMwk1xudD6hEYQUNO+sw9ZnmZ3WvHCSH3UDTxqd/OIdan53dfnz/l sI5FQXKsKeOHHXTZNIPILYA6/5/RX+6hrnMbntSRVzRskm3NXAzHR5vUIfovxZhb JuB9sDQ5tAJOBcIQtcK+uo5Kr7oOA5iiND9ut6AXHAbb25k+sb6uOH4kK3iIv32s 38tl/hKlU3RhnCxKES67enquUkevCuvxcXOYsE0CXcr+TmSH2Vb+LixbQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=m6KPWyznNgWC/glCCzkSUC1tyF3aM/1+InUGD3SPOyA=; b=q1rCVXiW DlAujWazKOcW9KBkzn0fyHddWmf4cJQbJlw4kQeXMWRFskOz97QusLkGTSHJ2Tjl Qiv4ALJxcPUscEi2a01pQ91JUr9SIjX8bXbLHvejNy8JiW/BIvFDM9+UghmzT6YC CmDJ7FhnqXaxxGJdGSfkzYBoZJf1NTfDy+KkOoCsGw4DtOZO6vM73vUhH8p5U8Kg l4pzsb7V7wK7I4LNvyEKe/uJexjfT5+YLteCDsGjQN4aVTjVzjBG6nURsN8qrPzr iUQjzqwTsh7ty0ZnHdMcN23/WgaYpOZxlzC5Cw5EfhYcJhGZOsxB25jzvH487q1U 19c5/y0wib6Bsg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id A01A73065E7B for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:24 -0400 (EDT) From: Marius Bakke Date: Mon, 27 Apr 2020 20:22:19 +0200 Message-Id: <20200427182222.28142-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200427182222.28142-1-mbakke@fastmail.com> References: <20200427182222.28142-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The derivation changes slightly, but the end result is bit-identical. * gnu/packages/make-bootstrap.scm (make-guile-static-stripped): New procedure. (%guile-static-stripped): Adjust accordingly. --- gnu/packages/make-bootstrap.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index f4d7fd6a2a..d336818299 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -745,30 +745,30 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "guile-default-utf8.patch" "guile-linux-syscalls.patch"))) -(define %guile-static-stripped - ;; A stripped static Guile binary, for use during bootstrap. - (package (inherit %guile-static) - (name "guile-static-stripped") +(define* (make-guile-static-stripped static-guile) + (package + (inherit static-guile) + (name (string-append (package-name static-guile) "-stripped")) (build-system trivial-build-system) (arguments ;; The end result should depend on nothing but itself. `(#:allowed-references ("out") #:modules ((guix build utils)) #:builder - (let () + (let ((version ,(version-major+minor (package-version static-guile)))) (use-modules (guix build utils)) (let* ((in (assoc-ref %build-inputs "guile")) (out (assoc-ref %outputs "out")) (guile1 (string-append in "/bin/guile")) (guile2 (string-append out "/bin/guile"))) - (mkdir-p (string-append out "/share/guile/2.0")) - (copy-recursively (string-append in "/share/guile/2.0") - (string-append out "/share/guile/2.0")) + (mkdir-p (string-append out "/share/guile/" version)) + (copy-recursively (string-append in "/share/guile/" version) + (string-append out "/share/guile/" version)) - (mkdir-p (string-append out "/lib/guile/2.0/ccache")) - (copy-recursively (string-append in "/lib/guile/2.0/ccache") - (string-append out "/lib/guile/2.0/ccache")) + (mkdir-p (string-append out "/lib/guile/" version "/ccache")) + (copy-recursively (string-append in "/lib/guile/" version "/ccache") + (string-append out "/lib/guile/" version "/ccache")) (mkdir (string-append out "/bin")) (copy-file guile1 guile2) @@ -789,10 +789,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." '((invoke guile2 "--version"))) #t)))) - (inputs `(("guile" ,%guile-static))) + (inputs `(("guile" ,static-guile))) (outputs '("out")) (synopsis "Minimal statically-linked and relocatable Guile"))) +(define %guile-static-stripped + ;; A stripped static Guile binary, for use during bootstrap. + (make-guile-static-stripped %guile-static)) + (define (tarball-package pkg) "Return a package containing a tarball of PKG." (package (inherit pkg) -- 2.26.2 From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 3/5] gnu: make-bootstrap: Export MAKE-GUILE-STATIC and MAKE-GUILE-STATIC-STRIPPED. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158801176917544 (code B ref 40908); Mon, 27 Apr 2020 18:23:02 +0000 Received: (at 40908) by debbugs.gnu.org; 27 Apr 2020 18:22:49 +0000 Received: from localhost ([127.0.0.1]:38100 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8P2-0004Ys-Mf for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:48 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:54113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Om-0004Xo-G6 for 40908@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:44 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id CE2E54AD for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:26 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:22:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=VWcNaQbofwXda qqEV/HKMgeRGbwrhaoEd8VQwt/z764=; b=mjGgbjMMRdbyAiJlzL2B6boh24wab gQ7EUzYeKjBKLcq2/SRsZsFzy+hqT8M66ZM95INL+i0fwtx5seY2FiU/457jpAne Mh92arWYGt2U1kIOK1v5zXvondgttrBThCgYQcaUrhb8sqw6I69/xKnNh4tfDTxT 3XlIieQKwj2fHzwj8ZCjS36SP4LM0pG+3xGbcb/aDDN1f36z9eGfTpvXSnGdmBAx 1xjJZck1/saSfFeEmfq+M6gJ+LR0tcPxT2DlE6GSNMChK0kbyoHo72EoS9wsZ7HH ggSUBCQvk30RcvZBABEyEnwlcdQrfY9IwXpWmsZwuHVIPiQk0kjLApvUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=VWcNaQbofwXdaqqEV/HKMgeRGbwrhaoEd8VQwt/z764=; b=j7sR+Zag 2O4WoxLLdOUE5pppb9E/ReUkRLjvoJCkd5hDrdV1c+TIupVk8YK+CamzvoyAG+9H lfa9uei7Hm2elmxBvFjN+wKOfLE5wQhzHJ0oRlbKl76Ptltae4M3a6KzM7mcfMZ0 uPfZmnGhQ6xykBnZ0xG8Rse6FtN5Ks13uiDOuVhczVHiu4qcPW2oD5/OBnslHApb PHX1Iu8X6V5IG1qHtPO8oUIT0d3ylpgpjJsaUsp3gm85rBaIoIiifU6tNFIbgeGT H6iimPU1JQJxs9CXPSPQdc1KGENDS4g7vedFVf8LK7SsO2jg+2sBoQWwmV84qXBO AxTggmYBBTk9eg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 22C8F3065E79 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:26 -0400 (EDT) From: Marius Bakke Date: Mon, 27 Apr 2020 20:22:20 +0200 Message-Id: <20200427182222.28142-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200427182222.28142-1-mbakke@fastmail.com> References: <20200427182222.28142-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/make-bootstrap.scm (make-guile-static, make-guile-static-stripped): Export. --- gnu/packages/make-bootstrap.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d336818299..443e778824 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -45,7 +45,10 @@ #:use-module (gnu packages multiprecision) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:export (%bootstrap-binaries-tarball + #:export (make-guile-static + make-guile-static-stripped + + %bootstrap-binaries-tarball %linux-libre-headers-bootstrap-tarball %binutils-bootstrap-tarball %glibc-bootstrap-tarball -- 2.26.2 From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 5/5] gnu: make-bootstrap: Do not export %GUILE-STATIC-STRIPPED. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158801176917551 (code B ref 40908); Mon, 27 Apr 2020 18:23:02 +0000 Received: (at 40908) by debbugs.gnu.org; 27 Apr 2020 18:22:49 +0000 Received: from localhost ([127.0.0.1]:38102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8P2-0004Yv-UL for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:49 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:53835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Op-0004Xt-D1 for 40908@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:44 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id D76C0458 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:29 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:22:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=0elPi/IANUMgp i1mPu0kpi4UbfVIetzRF/gCKwuUfEo=; b=Kaygor1/AmeYRLnt/7fpJXojny2Ti wxAlpAPJfg+sk58J/AxVbyaA0pzcZNk6mUkbM7njYa9yNwBOKJ90CL6/8lSzBQF1 wYRNDNseUQtpp3S8BF8xn89HgYwZY+y0LKngSF38yDHq//Zh5gPGP1L6HTRvLT9m KCdTCaiEw8EC30kdiunhlUgB9XOr1Uqesga7JgFn9B6rCcVRFi2vMgokWXAewJ1T B/GWZBRNqa90G7thijxYDlSjQ8NHoCZGC3+RH/IsI2dp9vGw33G6g6WUFcB2rOre eOtMZNmWrPQsmldoafgYWaBNQiGsMka8Om2oS7FfJxOjBIv0J+Uut8AYw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=0elPi/IANUMgpi1mPu0kpi4UbfVIetzRF/gCKwuUfEo=; b=cEt6kH6Y UZzT14NQbLO+5Pb7YxuS3uaCmchzHs7089KElSNiIY1/zMqitt++YidGcSeX/m2w UFaCAvm0KcoRqHRtKYtNHX645zx3xayE1d3D6bbxb4V2ewWW9ULPOmp+1+hBirTB 21tF+zuAgLAKlW+iPDW/wHPmcV9VGLOIyuB/ho+huLeRBopWaC+sdg9PM7P+jHJT 6zTt7rcxSepfgsioZpzkKswNsP9FtOxeh7gNPPYUtc8jxv1bYTj0FECnOzTFbBWW Z8w2x3DqqrLHfzjfBw3yc+BWt2Og4JhKKCmlr9bt9BKApFzOmndFDZfe5ShIWDZP cpfkkoNFpgJwWQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvg hrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 2D8A13065DA8 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:29 -0400 (EDT) From: Marius Bakke Date: Mon, 27 Apr 2020 20:22:22 +0200 Message-Id: <20200427182222.28142-5-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200427182222.28142-1-mbakke@fastmail.com> References: <20200427182222.28142-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/make-bootstrap.scm (%guile-static-stripped): Remove export. --- gnu/packages/make-bootstrap.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 443e778824..981c7aa24e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -56,9 +56,7 @@ %guile-bootstrap-tarball %mescc-tools-bootstrap-tarball %mes-bootstrap-tarball - %bootstrap-tarballs - - %guile-static-stripped)) + %bootstrap-tarballs)) ;;; Commentary: ;;; -- 2.26.2 From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 1/5] gnu: %guile-static: Rewrite in terms of 'make-guile-static'. References: <20200427182027.27813-1-mbakke@fastmail.com> In-Reply-To: <20200427182027.27813-1-mbakke@fastmail.com> Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158801177017558 (code B ref 40908); Mon, 27 Apr 2020 18:23:03 +0000 Received: (at 40908) by debbugs.gnu.org; 27 Apr 2020 18:22:50 +0000 Received: from localhost ([127.0.0.1]:38104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8P3-0004Z2-7u for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:49 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:36025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Om-0004Xm-2D for 40908@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:46 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E6FDE793 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:22:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=tkNC5JQnPY6XgwIaAkIwnfm1/K kKx/WfNyF6gRNnonM=; b=RMtriytspESr7kBtG7tlrxdy1tSH/BkNM02iUIo2yn iqWF4z06xPqmBOEtahDmeWoCGkj64G8GXXv7+0nS+ydz3mqFp6zcpYy0YOI25N3D U1K6TwufhyxlqeYNvtNmwivIIs08rPXJygV7PBxLnEtZafuzH2h+H/eJhuknmn2W v5Ibxp7olhGktOHBeb9OLTmViQcc5re4X4spSH4AajsrZfwEzPfC1cnyFsxJnusx bZCfTEwe3JK/NYdXHJzaAQ/WX+1nhhhpoufU8hFhrxMyoVDIYNiWR8qfE5ZK3v1n H0GzJvQ9HPu0c4hoj0U0jkuSX+qCYsw+JjU5J+IIhS+g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=tkNC5JQnPY6XgwIaA kIwnfm1/KkKx/WfNyF6gRNnonM=; b=OYF0NEHLdtmqt0JQpcHl3xJMLH6LvGghK WRLVzlVavBaDgNF97z+4nsaVD2b+u4J7NunyZfFwDSeKbHnH4yK6RruPV8BeZ1QO o0f56EqITRXJe+j7st1rgdsVRa4uTyQ6KEAzykEbuXbV2+hIjM4A5s4hdkVB2pd2 9poIszJ9i0ZRErdzhdJvGHXd34pHEF5eFuFe9H59WG1ooHvvUllqHFSQbEcGDFYz XVUvBiqYagAVyIGwuJLYml9aIEYSeJ+sOB2pAwXdUgHKnBAxFSLzlB43FbK2DIBE x9vsjTSyLa0ZyqGqCbnN8ykGVoC0xwfJY0MjUTdlQ2CU+LBiAJsXw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhm rghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvghruf hiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgr ihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 2909D3065E7C for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:23 -0400 (EDT) From: Marius Bakke Date: Mon, 27 Apr 2020 20:22:18 +0200 Message-Id: <20200427182222.28142-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The derivation remains unchanged. * gnu/packages/make-bootstrap.scm (make-guile-static): New procedure. (%guile-static): Adjust accordingly. --- gnu/packages/make-bootstrap.scm | 124 ++++++++++++++++---------------- 1 file changed, 64 insertions(+), 60 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 5716ed3886..f4d7fd6a2a 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -676,70 +676,74 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("mes" ,%mes-minimal))))) +(define* (make-guile-static guile patches) + (package-with-relocatable-glibc + (static-package + (package + (inherit guile) + (source + (origin (inherit (package-source guile)) + (patches (append (map search-patch patches) + (origin-patches (package-source guile)))))) + (name (string-append (package-name guile) "-static")) + (synopsis "Statically-linked and relocatable Guile") + + ;; Remove the 'debug' output (see above for the reason.) + (outputs (delete "debug" (package-outputs guile))) + + (inputs + `(("libunistring:static" ,libunistring "static") + ,@(package-inputs guile))) + + (propagated-inputs + `(("bdw-gc" ,libgc/static-libs) + ,@(alist-delete "bdw-gc" + (package-propagated-inputs guile)))) + (arguments + (substitute-keyword-arguments (package-arguments guile) + ((#:configure-flags flags '()) + ;; When `configure' checks for ltdl availability, it + ;; doesn't try to link using libtool, and thus fails + ;; because of a missing -ldl. Work around that. + ''("LDFLAGS=-ldl")) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + + ;; Do not record the absolute file name of 'sh' in + ;; (ice-9 popen). This makes 'open-pipe' unusable in + ;; a build chroot ('open-pipe*' is fine) but avoids + ;; keeping a reference to Bash. + (delete 'pre-configure) + + (add-before 'configure 'static-guile + (lambda _ + (substitute* "libguile/Makefile.in" + ;; Create a statically-linked `guile' + ;; executable. + (("^guile_LDFLAGS =") + "guile_LDFLAGS = -all-static") + + ;; Add `-ldl' *after* libguile-2.0.la. + (("^guile_LDADD =(.*)$" _ ldadd) + (string-append "guile_LDADD = " + (string-trim-right ldadd) + " -ldl\n"))))))) + ((#:tests? _ #f) + ;; There are uses of `dynamic-link' in + ;; {foreign,coverage}.test that don't fly here. + #f) + ((#:parallel-build? _ #f) + ;; Work around the fact that the Guile build system is + ;; not deterministic when parallel-build is enabled. + #f))))))) + (define %guile-static ;; A statically-linked Guile that is relocatable--i.e., it can search ;; .scm and .go files relative to its installation directory, rather ;; than in hard-coded configure-time paths. - (let* ((patches (cons* (search-patch "guile-relocatable.patch") - (search-patch "guile-default-utf8.patch") - (search-patch "guile-linux-syscalls.patch") - (origin-patches (package-source guile-2.0)))) - (source (origin (inherit (package-source guile-2.0)) - (patches patches))) - (guile (package (inherit guile-2.0) - (name (string-append (package-name guile-2.0) "-static")) - (source source) - (synopsis "Statically-linked and relocatable Guile") - - ;; Remove the 'debug' output (see above for the reason.) - (outputs (delete "debug" (package-outputs guile-2.0))) - - (inputs - `(("libunistring:static" ,libunistring "static") - ,@(package-inputs guile-2.2))) - - (propagated-inputs - `(("bdw-gc" ,libgc/static-libs) - ,@(alist-delete "bdw-gc" - (package-propagated-inputs guile-2.0)))) - (arguments - (substitute-keyword-arguments (package-arguments guile-2.0) - ((#:configure-flags flags '()) - ;; When `configure' checks for ltdl availability, it - ;; doesn't try to link using libtool, and thus fails - ;; because of a missing -ldl. Work around that. - ''("LDFLAGS=-ldl")) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - - ;; Do not record the absolute file name of 'sh' in - ;; (ice-9 popen). This makes 'open-pipe' unusable in - ;; a build chroot ('open-pipe*' is fine) but avoids - ;; keeping a reference to Bash. - (delete 'pre-configure) - - (add-before 'configure 'static-guile - (lambda _ - (substitute* "libguile/Makefile.in" - ;; Create a statically-linked `guile' - ;; executable. - (("^guile_LDFLAGS =") - "guile_LDFLAGS = -all-static") - - ;; Add `-ldl' *after* libguile-2.0.la. - (("^guile_LDADD =(.*)$" _ ldadd) - (string-append "guile_LDADD = " - (string-trim-right ldadd) - " -ldl\n"))))))) - ((#:tests? _ #f) - ;; There are uses of `dynamic-link' in - ;; {foreign,coverage}.test that don't fly here. - #f) - ((#:parallel-build? _ #f) - ;; Work around the fact that the Guile build system is - ;; not deterministic when parallel-build is enabled. - #f)))))) - (package-with-relocatable-glibc (static-package guile)))) + (make-guile-static guile-2.0 '("guile-relocatable.patch" + "guile-default-utf8.patch" + "guile-linux-syscalls.patch"))) (define %guile-static-stripped ;; A stripped static Guile binary, for use during bootstrap. -- 2.26.2 From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 4/5] linux-initrd: Use Guile 3.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158801177017565 (code B ref 40908); Mon, 27 Apr 2020 18:23:03 +0000 Received: (at 40908) by debbugs.gnu.org; 27 Apr 2020 18:22:50 +0000 Received: from localhost ([127.0.0.1]:38106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8P3-0004Z9-QG for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:50 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:44387) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Oo-0004Xr-1E for 40908@debbugs.gnu.org; Mon, 27 Apr 2020 14:22:47 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 827FA33B for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:22:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=v8wVIwMM02MSM kGuXJ5LoUOEyWw4cISYNSamU1gti/k=; b=syZwVi2DGwov8r/8JfGrKR/p1GvXV IZ8se/WTxXj2Jw0ukOcX9YOnTtF5wQL0E7qTFQdUKkxbw1A3JcBK7eGMnJM/HFK+ hNOz6Th2ZxLajSdZelNJScQ9Ohex5fnvj4MS5oaegD+eelwOhuKxLxtIE69HBm9w bxTDJom+3PxX6amqI06D1nTvaddScxKgfT2j8NzNONkpunIbYovE3IzuJIvYQ7iF n3yYdtF3cNZNPqSwmY1oFi1Xf4mrBtJj9jzYOtCVfNup55Fyvc72hVugG/8BPNdQ sX8SnUCJiN1klLgOffQavJt1zeJoUeTOx50JQpv3mOZE17hMHxCSRjG0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=v8wVIwMM02MSMkGuXJ5LoUOEyWw4cISYNSamU1gti/k=; b=2HLhhDfJ t7MkqtYlwUChS99reSTrKao7DhpaFA5BSt5WdhIr9RJcBigciuV8LDOzwkkR97Ol q3nVJEJ6HsUWyuUYr1sDCovXUxkLqnfGcyK9GDH73AW19Cb3ptKSr5JCH/ZrKvd6 b86fL9e6W4+Glppicy1xmIM0F5oyHRI3YJKZHSeTWixMCuSf0+8HmxpeB+DXkLhE 0xOvJ0+as2P34EhAhB1XA5WuQk6VvGf4huiXJtWeg6EeQNOGMBCSa9G8wVdiJCku MtUuEfzfQqBUcqOB5s3BozsxreWHnYNDOJFSfa3nJrjEjzZWH12h409yfQqhfqWF a9W6XWommy+42g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 9D1603065DA8 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:22:27 -0400 (EDT) From: Marius Bakke Date: Mon, 27 Apr 2020 20:22:21 +0200 Message-Id: <20200427182222.28142-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200427182222.28142-1-mbakke@fastmail.com> References: <20200427182222.28142-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/guile-2.2-default-utf8.patch: New file, extracted from commit 2acfe022a740f79b593348cc6362cc4ee8f33bb4. * gnu/packages/patches/guile-3.0-linux-syscalls.patch, gnu/packages/patches/guile-3.0-relocatable.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Move all Guile patches together while at it. * gnu/system/linux-initrd.scm (guile-static-stripped): New variable. (expression->initrd)[guile]: Change from %GUILE-STATIC-STRIPPED to custom variant using the above patches. --- gnu/local.mk | 7 +- .../patches/guile-2.2-default-utf8.patch | 82 ++++ .../patches/guile-3.0-linux-syscalls.patch | 353 ++++++++++++++++++ .../patches/guile-3.0-relocatable.patch | 79 ++++ gnu/system/linux-initrd.scm | 10 +- 5 files changed, 526 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/guile-2.2-default-utf8.patch create mode 100644 gnu/packages/patches/guile-3.0-linux-syscalls.patch create mode 100644 gnu/packages/patches/guile-3.0-relocatable.patch diff --git a/gnu/local.mk b/gnu/local.mk index b3d6054b50..2a1bbcd3fb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1026,11 +1026,14 @@ dist_patch_DATA = \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ %D%/packages/patches/guile-default-utf8.patch \ + %D%/packages/patches/guile-2.2-default-utf8.patch \ + %D%/packages/patches/guile-relocatable.patch \ + %D%/packages/patches/guile-3.0-relocatable.patch \ + %D%/packages/patches/guile-linux-syscalls.patch \ + %D%/packages/patches/guile-3.0-linux-syscalls.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-json-cross.patch \ - %D%/packages/patches/guile-linux-syscalls.patch \ %D%/packages/patches/guile-present-coding.patch \ - %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \ diff --git a/gnu/packages/patches/guile-2.2-default-utf8.patch b/gnu/packages/patches/guile-2.2-default-utf8.patch new file mode 100644 index 0000000000..f55a6430c1 --- /dev/null +++ b/gnu/packages/patches/guile-2.2-default-utf8.patch @@ -0,0 +1,82 @@ +This hack makes Guile default to UTF-8. This avoids calls to +`iconv_open'; `iconv_open' tries to open shared objects that aren't +available during bootstrap, so using UTF-8 avoids that (and UTF-8 has +built-in conversions in glibc, too.) + +diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c +index 0ac5ea6a6..f73301e2f 100644 +--- a/libguile/bytevectors.c ++++ b/libguile/bytevectors.c +@@ -1931,7 +1931,7 @@ utf_encoding_name (char *name, size_t utf_width, SCM endianness) + if (scm_i_is_narrow_string (str)) \ + { \ + err = mem_iconveh (scm_i_string_chars (str), c_strlen, \ +- "ISO-8859-1", c_utf_name, \ ++ "UTF-8", c_utf_name, \ + iconveh_question_mark, NULL, \ + &c_utf, &c_utf_len); \ + if (SCM_UNLIKELY (err)) \ +diff --git a/libguile/ports.c b/libguile/ports.c +index 45e62f4e4..42012f3aa 100644 +--- a/libguile/ports.c ++++ b/libguile/ports.c +@@ -974,7 +974,9 @@ canonicalize_encoding (const char *enc) + char *ret; + int i; + +- if (!enc || encoding_matches (enc, sym_ISO_8859_1)) ++ if (enc == NULL) ++ return sym_UTF_8; ++ if (encoding_matches (enc, sym_ISO_8859_1)) + return sym_ISO_8859_1; + if (encoding_matches (enc, sym_UTF_8)) + return sym_UTF_8; +@@ -4198,7 +4200,7 @@ scm_init_ports (void) + scm_c_define ("%default-port-conversion-strategy", + scm_make_fluid_with_default (sym_substitute)); + /* Use the locale as the default port encoding. */ +- scm_i_set_default_port_encoding (locale_charset ()); ++ scm_i_set_default_port_encoding ("UTF-8"); + + scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, + "scm_init_ice_9_ports", +diff --git a/libguile/strings.c b/libguile/strings.c +index 056b4c99f..63a6c050d 100644 +--- a/libguile/strings.c ++++ b/libguile/strings.c +@@ -1579,7 +1579,7 @@ scm_i_default_string_failed_conversion_handler (void) + SCM + scm_from_locale_stringn (const char *str, size_t len) + { +- return scm_from_stringn (str, len, locale_charset (), ++ return scm_from_stringn (str, len, "UTF-8", + scm_i_default_string_failed_conversion_handler ()); + } + +@@ -1907,7 +1907,7 @@ char * + scm_to_locale_stringn (SCM str, size_t *lenp) + { + return scm_to_stringn (str, lenp, +- locale_charset (), ++ "UTF-8", + scm_i_default_string_failed_conversion_handler ()); + } + +@@ -2195,7 +2195,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, + scm_wrong_type_arg_msg (NULL, 0, str, "string"); + + if (encoding == NULL) +- encoding = "ISO-8859-1"; ++ encoding = "UTF-8"; + + if (c_strcasecmp (encoding, "UTF-8") == 0) + /* This is the most common case--e.g., when calling libc bindings +@@ -2247,7 +2247,7 @@ scm_to_stringn (SCM str, size_t *lenp, const char *encoding, + if (scm_i_is_narrow_string (str)) + { + ret = mem_iconveh (scm_i_string_chars (str), ilen, +- "ISO-8859-1", encoding, ++ "UTF-8", encoding, + (enum iconv_ilseq_handler) handler, NULL, + &buf, &len); + diff --git a/gnu/packages/patches/guile-3.0-linux-syscalls.patch b/gnu/packages/patches/guile-3.0-linux-syscalls.patch new file mode 100644 index 0000000000..55d6a2ab52 --- /dev/null +++ b/gnu/packages/patches/guile-3.0-linux-syscalls.patch @@ -0,0 +1,353 @@ +From 9d670c8045830a64fcbc6aac6ae6fd37335a7348 Mon Sep 17 00:00:00 2001 +From: Marius Bakke +Date: Thu, 19 Mar 2020 12:49:31 +0100 +Subject: [PATCH] port linux syscalls + +--- + libguile/posix.c | 330 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 330 insertions(+) + +diff --git a/libguile/posix.c b/libguile/posix.c +index a1520abc4..61d57cdb9 100644 +--- a/libguile/posix.c ++++ b/libguile/posix.c +@@ -2375,6 +2375,336 @@ scm_init_popen (void) + } + #endif /* HAVE_START_CHILD */ + ++ ++/* Linux! */ ++#ifdef __linux__ ++ ++#include ++#include ++ ++#include "libguile/foreign.h" ++#include "libguile/bytevectors.h" ++#include ++ ++SCM_DEFINE (scm_mount, "mount", 3, 2, 0, ++ (SCM source, SCM target, SCM type, SCM flags, SCM data), ++ "Mount file system of @var{type} specified by @var{source} " ++ "on @var{target}.") ++#define FUNC_NAME s_scm_mount ++{ ++ int err; ++ char *c_source, *c_target, *c_type, *c_data; ++ unsigned long c_flags; ++ ++ c_source = scm_to_locale_string (source); ++ c_target = scm_to_locale_string (target); ++ c_type = scm_to_locale_string (type); ++ c_flags = SCM_UNBNDP (flags) ? 0 : scm_to_ulong (flags); ++ ++ if (SCM_UNBNDP (data) || scm_is_false (data)) ++ c_data = NULL; ++ else ++ c_data = scm_to_locale_string (data); ++ ++ err = mount (c_source, c_target, c_type, c_flags, c_data); ++ if (err != 0) ++ err = errno; ++ ++ free (c_source); ++ free (c_target); ++ free (c_type); ++ ++ if (c_data != NULL) ++ free (c_data); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_umount, "umount", 1, 0, 0, ++ (SCM target), ++ "Unmount the file system on @var{target}.") ++#define FUNC_NAME s_scm_umount ++{ ++ int err; ++ char *c_target; ++ ++ c_target = scm_to_locale_string (target); ++ ++ err = umount (c_target); ++ if (err != 0) ++ err = errno; ++ ++ free (c_target); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++/* Linux's module installation syscall. See `kernel/module.c' in Linux; ++ the function itself is part of the GNU libc. ++ ++ Load the LEN bytes at MODULE as a kernel module, with arguments from ++ ARGS, a space-separated list of options. */ ++extern long init_module (void *module, unsigned long len, const char *args); ++ ++/* Load a kernel module from FD. FLAGS must be a bitwise or of ++ MODULE_INIT_* constants. The GNU libc doesn't provide a wrapper for ++ this one so we use 'syscall'. */ ++static int ++finit_module (int fd, const char *args, int flags) ++{ ++ return syscall (SYS_finit_module, fd, args, flags); ++} ++ ++ ++SCM_DEFINE (scm_load_linux_module, "load-linux-module", 1, 1, 0, ++ (SCM data, SCM options), ++ "Load the Linux kernel module whose contents are in bytevector " ++ "DATA (the contents of a @code{.ko} file), with the arguments " ++ "from the OPTIONS string.") ++#define FUNC_NAME s_scm_load_linux_module ++{ ++ long err; ++ void *c_data; ++ unsigned long c_len; ++ char *c_options; ++ ++ SCM_VALIDATE_BYTEVECTOR (SCM_ARG1, data); ++ ++ c_data = SCM_BYTEVECTOR_CONTENTS (data); ++ c_len = SCM_BYTEVECTOR_LENGTH (data); ++ c_options = ++ scm_to_locale_string (SCM_UNBNDP (options) ? scm_nullstr : options); ++ ++ err = init_module (c_data, c_len, c_options); ++ ++ free (c_options); ++ ++ if (err != 0) ++ SCM_SYSERROR; ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_load_linux_module_fd, "load-linux-module/fd", 1, 2, 0, ++ (SCM fd, SCM options, SCM flags), ++ "Load the Linux kernel module from the file at FD, " ++ "with the arguments from the OPTIONS string, and " ++ "optionally the given FLAGS.") ++#define FUNC_NAME s_scm_load_linux_module_fd ++{ ++ long err; ++ int c_fd, c_flags; ++ char *c_options; ++ ++ c_fd = scm_to_int (fd); ++ c_options = ++ scm_to_locale_string (SCM_UNBNDP (options) ? scm_nullstr : options); ++ c_flags = SCM_UNBNDP (flags) ? 0 : scm_to_int (flags); ++ ++ err = finit_module (c_fd, c_options, c_flags); ++ ++ free (c_options); ++ ++ if (err != 0) ++ SCM_SYSERROR; ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++ ++/* Rebooting, halting, and all that. */ ++ ++#include ++ ++SCM_VARIABLE_INIT (flag_RB_AUTOBOOT, "RB_AUTOBOOT", ++ scm_from_int (RB_AUTOBOOT)); ++SCM_VARIABLE_INIT (flag_RB_HALT_SYSTEM, "RB_HALT_SYSTEM", ++ scm_from_int (RB_HALT_SYSTEM)); ++SCM_VARIABLE_INIT (flag_RB_ENABLE_CAD, "RB_ENABLE_CAD", ++ scm_from_int (RB_ENABLE_CAD)); ++SCM_VARIABLE_INIT (flag_RB_DISABLE_CAD, "RB_DISABLE_CAD", ++ scm_from_int (RB_DISABLE_CAD)); ++SCM_VARIABLE_INIT (flag_RB_POWER_OFF, "RB_POWER_OFF", ++ scm_from_int (RB_POWER_OFF)); ++SCM_VARIABLE_INIT (flag_RB_SW_SUSPEND, "RB_SW_SUSPEND", ++ scm_from_int (RB_SW_SUSPEND)); ++SCM_VARIABLE_INIT (flag_RB_KEXEC, "RB_KEXEC", ++ scm_from_int (RB_KEXEC)); ++ ++SCM_DEFINE (scm_reboot, "reboot", 0, 1, 0, ++ (SCM command), ++ "Reboot the system. @var{command} must be one of the @code{RB_} " ++ "constants; if omitted, @var{RB_AUTOBOOT} is used, thus " ++ "performing a hard reset.") ++#define FUNC_NAME s_scm_reboot ++{ ++ int c_command; ++ ++ if (SCM_UNBNDP (command)) ++ c_command = RB_AUTOBOOT; ++ else ++ c_command = scm_to_int (command); ++ ++ reboot (c_command); ++ ++ return SCM_UNSPECIFIED; /* likely unreached */ ++} ++#undef FUNC_NAME ++ ++/* Linux network interfaces. See . */ ++ ++#include ++#include ++#include "libguile/socket.h" ++ ++SCM_VARIABLE_INIT (flag_IFF_UP, "IFF_UP", ++ scm_from_int (IFF_UP)); ++SCM_VARIABLE_INIT (flag_IFF_BROADCAST, "IFF_BROADCAST", ++ scm_from_int (IFF_BROADCAST)); ++SCM_VARIABLE_INIT (flag_IFF_DEBUG, "IFF_DEBUG", ++ scm_from_int (IFF_DEBUG)); ++SCM_VARIABLE_INIT (flag_IFF_LOOPBACK, "IFF_LOOPBACK", ++ scm_from_int (IFF_LOOPBACK)); ++SCM_VARIABLE_INIT (flag_IFF_POINTOPOINT, "IFF_POINTOPOINT", ++ scm_from_int (IFF_POINTOPOINT)); ++SCM_VARIABLE_INIT (flag_IFF_NOTRAILERS, "IFF_NOTRAILERS", ++ scm_from_int (IFF_NOTRAILERS)); ++SCM_VARIABLE_INIT (flag_IFF_RUNNING, "IFF_RUNNING", ++ scm_from_int (IFF_RUNNING)); ++SCM_VARIABLE_INIT (flag_IFF_NOARP, "IFF_NOARP", ++ scm_from_int (IFF_NOARP)); ++SCM_VARIABLE_INIT (flag_IFF_PROMISC, "IFF_PROMISC", ++ scm_from_int (IFF_PROMISC)); ++SCM_VARIABLE_INIT (flag_IFF_ALLMULTI, "IFF_ALLMULTI", ++ scm_from_int (IFF_ALLMULTI)); ++ ++SCM_DEFINE (scm_set_network_interface_address, "set-network-interface-address", ++ 3, 0, 0, ++ (SCM socket, SCM name, SCM address), ++ "Configure network interface @var{name}.") ++#define FUNC_NAME s_scm_set_network_interface_address ++{ ++ char *c_name; ++ struct ifreq ifr; ++ struct sockaddr *c_address; ++ size_t sa_len; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ c_address = scm_to_sockaddr (address, &sa_len); ++ ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ memcpy (&ifr.ifr_addr, c_address, sa_len); ++ ++ err = ioctl (fd, SIOCSIFADDR, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ free (c_address); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_set_network_interface_flags, "set-network-interface-flags", ++ 3, 0, 0, ++ (SCM socket, SCM name, SCM flags), ++ "Change the flags of network interface @var{name} to " ++ "@var{flags}.") ++#define FUNC_NAME s_scm_set_network_interface_flags ++{ ++ struct ifreq ifr; ++ char *c_name; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ ifr.ifr_flags = scm_to_short (flags); ++ ++ err = ioctl (fd, SIOCSIFFLAGS, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return SCM_UNSPECIFIED; ++} ++#undef FUNC_NAME ++ ++SCM_DEFINE (scm_network_interface_flags, "network-interface-flags", ++ 2, 0, 0, ++ (SCM socket, SCM name), ++ "Return the flags of network interface @var{name}.") ++#define FUNC_NAME s_scm_network_interface_flags ++{ ++ struct ifreq ifr; ++ char *c_name; ++ int fd, err; ++ ++ socket = SCM_COERCE_OUTPORT (socket); ++ SCM_VALIDATE_OPFPORT (1, socket); ++ fd = SCM_FPORT_FDES (socket); ++ ++ memset (&ifr, 0, sizeof ifr); ++ c_name = scm_to_locale_string (name); ++ strncpy (ifr.ifr_name, c_name, sizeof ifr.ifr_name - 1); ++ ++ err = ioctl (fd, SIOCGIFFLAGS, &ifr); ++ if (err != 0) ++ err = errno; ++ ++ free (c_name); ++ ++ if (err != 0) ++ { ++ errno = err; ++ SCM_SYSERROR; ++ } ++ ++ return scm_from_short (ifr.ifr_flags); ++} ++#undef FUNC_NAME ++#endif ++ + void + scm_init_posix () + { +-- +2.25.2 + diff --git a/gnu/packages/patches/guile-3.0-relocatable.patch b/gnu/packages/patches/guile-3.0-relocatable.patch new file mode 100644 index 0000000000..2ffc79fa70 --- /dev/null +++ b/gnu/packages/patches/guile-3.0-relocatable.patch @@ -0,0 +1,79 @@ +From 5bd112b292a2b177a479099cc06e998747025587 Mon Sep 17 00:00:00 2001 +From: Marius Bakke +Date: Thu, 19 Mar 2020 12:49:02 +0100 +Subject: [PATCH] add guile relocatable + +--- + libguile/load.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/libguile/load.c b/libguile/load.c +index e95c36db1..53d27b0b4 100644 +--- a/libguile/load.c ++++ b/libguile/load.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -334,6 +335,32 @@ scm_init_load_path () + SCM cpath = SCM_EOL; + + #ifdef SCM_LIBRARY_DIR ++ char *program, *bin_dir, *prefix, *module_dir, *ccache_dir; ++ ++ /* Determine the source and compiled module directories at run-time, ++ relative to the executable's location. ++ ++ Note: Use /proc/self/exe instead of argv[0] because the latter is ++ not necessarily an absolute, nor a valid file name. */ ++ ++ program = scm_gc_malloc_pointerless (256, "string"); ++ readlink ("/proc/self/exe", program, 256); ++ ++ bin_dir = dirname (strdupa (program)); ++ ++ prefix = scm_gc_malloc_pointerless (strlen (bin_dir) + 4, "string"); ++ strcpy (prefix, bin_dir); ++ strcat (prefix, "/.."); ++ prefix = canonicalize_file_name (prefix); ++ ++ module_dir = scm_gc_malloc_pointerless (strlen (prefix) + 50, "string"); ++ strcpy (module_dir, prefix); ++ strcat (module_dir, "/share/guile/" SCM_EFFECTIVE_VERSION); ++ ++ ccache_dir = scm_gc_malloc_pointerless (strlen (prefix) + 50, "string"); ++ strcpy (ccache_dir, prefix); ++ strcat (ccache_dir, "/lib/guile/" SCM_EFFECTIVE_VERSION "/ccache"); ++ + env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_PATH")); + if (env && strcmp (env, "") == 0) + /* special-case interpret system-path=="" as meaning no system path instead +@@ -342,10 +369,7 @@ scm_init_load_path () + else if (env) + path = scm_parse_path (scm_from_locale_string (env), path); + else +- path = scm_list_4 (scm_from_utf8_string (SCM_LIBRARY_DIR), +- scm_from_utf8_string (SCM_SITE_DIR), +- scm_from_utf8_string (SCM_GLOBAL_SITE_DIR), +- scm_from_utf8_string (SCM_PKGDATA_DIR)); ++ path = scm_list_1 (scm_from_locale_string (module_dir)); + + env = scm_i_mirror_backslashes (getenv ("GUILE_SYSTEM_COMPILED_PATH")); + if (env && strcmp (env, "") == 0) +@@ -355,8 +379,7 @@ scm_init_load_path () + cpath = scm_parse_path (scm_from_locale_string (env), cpath); + else + { +- cpath = scm_list_2 (scm_from_utf8_string (SCM_CCACHE_DIR), +- scm_from_utf8_string (SCM_SITE_CCACHE_DIR)); ++ cpath = scm_list_1 (scm_from_locale_string (ccache_dir)); + } + + #endif /* SCM_LIBRARY_DIR */ +-- +2.25.2 + diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dcc9b6b937..818aac63f3 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -36,7 +36,7 @@ #:use-module ((gnu packages xorg) #:select (console-setup xkeyboard-config)) #:use-module ((gnu packages make-bootstrap) - #:select (%guile-static-stripped)) + #:select (make-guile-static make-guile-static-stripped)) #:use-module (gnu system file-systems) #:use-module (gnu system mapped-devices) #:use-module (gnu system keyboard) @@ -59,10 +59,14 @@ ;;; ;;; Code: - (define* (expression->initrd exp #:key - (guile %guile-static-stripped) + (guile (make-guile-static-stripped + (make-guile-static + guile-3.0 + '("guile-2.2-default-utf8.patch" + "guile-3.0-linux-syscalls.patch" + "guile-3.0-relocatable.patch")))) (gzip gzip) (name "guile-initrd") (system (%current-system))) -- 2.26.2 From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 4/5] linux-initrd: Use Guile 3.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 18:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158801244718916 (code B ref 40908); Mon, 27 Apr 2020 18:35:01 +0000 Received: (at 40908) by debbugs.gnu.org; 27 Apr 2020 18:34:07 +0000 Received: from localhost ([127.0.0.1]:38149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Zz-0004v2-FT for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:34:07 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:43965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Zu-0004uT-S5 for 40908@debbugs.gnu.org; Mon, 27 Apr 2020 14:34:06 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E5A7B7AA for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:33:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:33:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=dHGQOuDkkPMyxe7GCQF26Ts6oI MC3Pbw1Mj8piVAZ+U=; b=Wlphy0K3N9SiMix339qVDo1Fo5Swi754SgqJkI6tTc iyEyZP/u5Kpuj5i7l7ajkOHGr6eckyEirQrQu0j47qtnr4h8yQu3NM+vf2h/Ipk6 1FxGbtVxmH0WZAu+K+vnkr1R0vpYv1rsogGq3RrFN3WKuUvMvLs4Q3D5sTiM/Vpd JsSNKg4fCBZ8BqX2uO6inYMAthscPVmKFMVMXRGv5I8JOojVkX0exK5lIY53MG7o 5E7+8aKWuvFQgtJx35iwaOYPqN0Z4PHKSb6WzzLU0da+OyASE5TkP6hWnDDkqnZx oPEnf3ul5D/mrT/vqnL0h5cMMiEEr0j2PHRxCeg1dSOg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=dHGQOu DkkPMyxe7GCQF26Ts6oIMC3Pbw1Mj8piVAZ+U=; b=CtW0A5qEkfiVfXmBqK+c9L pBZO32yfv+XiCRnGsDObfjGxIsWU8BxA0//wYuKkktXAsNHyphHSM38sDaULEItc 495qiSNa77EVQuSkTUiYdIqKvfvRzUyMwt6wT04Hjh4oPleQen/tqD6ZdUvi2l38 yFWJ9TiCoXl1YeuzlVu42sfodW2cDgg6eSfz1BA++fw4mhFA6og/VUrVnVhOPQ9b YtSA3rlrtIa/rIxkRvfeqxGHkrUUToACBcLhtnuYNeDYB0j075v+CQTuYVTNZ137 EyyYToKx3gE87mMjvLEzdcIFvPSNvO18CMuQJ13QwAxfvHCdJ7U9LBDgID+gZOJA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffujghffgffkfggtgesghdtre ertdertdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghs thhmrghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 1D9893065E80 for <40908@debbugs.gnu.org>; Mon, 27 Apr 2020 14:33:56 -0400 (EDT) From: Marius Bakke In-Reply-To: <20200427182222.28142-4-mbakke@fastmail.com> References: <20200427182222.28142-1-mbakke@fastmail.com> <20200427182222.28142-4-mbakke@fastmail.com> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Mon, 27 Apr 2020 20:33:54 +0200 Message-ID: <87y2qg7p7x.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Marius Bakke writes: > * gnu/packages/patches/guile-2.2-default-utf8.patch: New file, extracted from > commit 2acfe022a740f79b593348cc6362cc4ee8f33bb4. > * gnu/packages/patches/guile-3.0-linux-syscalls.patch, > gnu/packages/patches/guile-3.0-relocatable.patch: New files. > * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Move all Guile patches > together while at it. > * gnu/system/linux-initrd.scm (guile-static-stripped): New variable. Whoops, I inlined this variable at the last minute and forgot to adjust the commit message. The patch also accidentally removes a newline, I've fixed that locally. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6nJZIACgkQoqBt8qM6 VPqdtAgAxnJ9RhXutmOnkY+pLNFTJUjpb8CWjJZ96sN/u6xKbe65UTbI0aZYPw8X P8EoTwOYc3ksrH3YuGlrk+DLfZdUgN36OJvaqyWrEEIcH1nAl8EKHMe2a5TK5QqS IsxCcXgrLrCG34Uq4rEfSlJxDKUvaBZkx+qemub1cEFMcuMp76ZIwcHVkXezAMdI 8OmaMEQRY5sm66EMw+HNYvq+pSTAkx1Xn4KwjUrKi2/aS2B4XxeBxzhxhsMnlRKA uoiCrxywLcX9b8bwp6B7fail/BJInC3i5gXsTLuPbjF1cOCSR/JUTjO6db3l6YyM bsa/GWs+21Qv1kvBPqEEHp9arhXB2w== =Sa4V -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 4/5] linux-initrd: Use Guile 3.0. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Apr 2020 22:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158828705528703 (code B ref 40908); Thu, 30 Apr 2020 22:51:02 +0000 Received: (at 40908) by debbugs.gnu.org; 30 Apr 2020 22:50:55 +0000 Received: from localhost ([127.0.0.1]:47874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUI18-0007St-RT for submit@debbugs.gnu.org; Thu, 30 Apr 2020 18:50:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUI17-0007Sh-Ra for 40908@debbugs.gnu.org; Thu, 30 Apr 2020 18:50:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60401) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUI11-0004FJ-83; Thu, 30 Apr 2020 18:50:47 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35816 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jUI0z-00084E-Ii; Thu, 30 Apr 2020 18:50:47 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200427182222.28142-1-mbakke@fastmail.com> <20200427182222.28142-4-mbakke@fastmail.com> Date: Fri, 01 May 2020 00:50:43 +0200 In-Reply-To: <20200427182222.28142-4-mbakke@fastmail.com> (Marius Bakke's message of "Mon, 27 Apr 2020 20:22:21 +0200") Message-ID: <87imhgk2po.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Marius Bakke skribis: > +++ b/gnu/packages/patches/guile-3.0-linux-syscalls.patch > @@ -0,0 +1,353 @@ > +From 9d670c8045830a64fcbc6aac6ae6fd37335a7348 Mon Sep 17 00:00:00 2001 > +From: Marius Bakke > +Date: Thu, 19 Mar 2020 12:49:31 +0100 > +Subject: [PATCH] port linux syscalls > + > +--- > + libguile/posix.c | 330 +++++++++++++++++++++++++++++++++++++++++++++++ > + 1 file changed, 330 insertions(+) [...] > --- /dev/null > +++ b/gnu/packages/patches/guile-3.0-relocatable.patch > @@ -0,0 +1,79 @@ > +From 5bd112b292a2b177a479099cc06e998747025587 Mon Sep 17 00:00:00 2001 > +From: Marius Bakke > +Date: Thu, 19 Mar 2020 12:49:02 +0100 > +Subject: [PATCH] add guile relocatable > + > +--- For these two patches, could you preserve the same or a similar heading as the original patches? Thanks! Ludo=E2=80=99. From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 5/5] gnu: make-bootstrap: Do not export %GUILE-STATIC-STRIPPED. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Apr 2020 22:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158828716928876 (code B ref 40908); Thu, 30 Apr 2020 22:53:01 +0000 Received: (at 40908) by debbugs.gnu.org; 30 Apr 2020 22:52:49 +0000 Received: from localhost ([127.0.0.1]:47878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUI2z-0007Vf-97 for submit@debbugs.gnu.org; Thu, 30 Apr 2020 18:52:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUI2y-0007VU-2h for 40908@debbugs.gnu.org; Thu, 30 Apr 2020 18:52:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60439) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUI2o-0001y0-Eh; Thu, 30 Apr 2020 18:52:38 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=35822 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jUI2n-0008EC-VI; Thu, 30 Apr 2020 18:52:38 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200427182222.28142-1-mbakke@fastmail.com> <20200427182222.28142-5-mbakke@fastmail.com> Date: Fri, 01 May 2020 00:52:36 +0200 In-Reply-To: <20200427182222.28142-5-mbakke@fastmail.com> (Marius Bakke's message of "Mon, 27 Apr 2020 20:22:22 +0200") Message-ID: <87ees4k2mj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Marius Bakke skribis: > * gnu/packages/make-bootstrap.scm (%guile-static-stripped): Remove export. > --- > gnu/packages/make-bootstrap.scm | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstra= p.scm > index 443e778824..981c7aa24e 100644 > --- a/gnu/packages/make-bootstrap.scm > +++ b/gnu/packages/make-bootstrap.scm > @@ -56,9 +56,7 @@ > %guile-bootstrap-tarball > %mescc-tools-bootstrap-tarball > %mes-bootstrap-tarball > - %bootstrap-tarballs > - > - %guile-static-stripped)) Are you sure it=E2=80=99s unused? Actually, what about simply adding =E2=80=98%guile-3.0-static-stripped=E2= =80=99 right in this file? I think it would work, right? And we could also keep =E2=80=98make-guile-static=E2=80=99 private. Apart from this, the patch series LGTM! Pretty exciting to have a JIT in the initrd. ;-) Thanks, Ludo=E2=80=99. From unknown Sat Aug 16 23:46:36 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40908] [PATCH core-updates 4/5] linux-initrd: Use Guile 3.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 May 2020 20:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40908 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 40908@debbugs.gnu.org Received: via spool by 40908-submit@debbugs.gnu.org id=B40908.158836394921501 (code B ref 40908); Fri, 01 May 2020 20:13:02 +0000 Received: (at 40908) by debbugs.gnu.org; 1 May 2020 20:12:29 +0000 Received: from localhost ([127.0.0.1]:50720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUc1M-0005aj-LM for submit@debbugs.gnu.org; Fri, 01 May 2020 16:12:28 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUc1L-0005aK-AD for 40908@debbugs.gnu.org; Fri, 01 May 2020 16:12:27 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2192D5C0445; Fri, 1 May 2020 16:12:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 01 May 2020 16:12:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=vEdDQitzluqmOcaTEROEDA5ONe 2A661e3qygbglmBlk=; b=h0joa+mmNWeoDmnErVLi4AKH25Yxpf/Uee/6mbYkrg CVGmsu0H52NqZvU50AouBMDfLPJnJ7q/H/ksnjyyg+PS6H/SiZ5dDbI5pV0ACLOz a796yYWC/XxvyUDKjkpgPYE0TQj6Y9XtZoVEGaeh/9Rt4YY8IRr11+GhK3izEi8t 1D4nhaRyEYS/sdjtnIkxbJIoRy1gERsE+sCAleX5taBA6RF0Ll7axsQJwY6gV4Lt fItbxcHbywNHT3ainAu0TlbaiLaKfGdAUpZQ4gPECom+eUxvWliD5LoJIYsIN5Wt cty7Kc+zxEqGREFNSZobX3ibkK4tHEX4jj8AIdXQliaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=vEdDQi tzluqmOcaTEROEDA5ONe2A661e3qygbglmBlk=; b=zRGcGFYNt8bHNMNTQMeERw BuxVK6AkhQlrBbFqu2eGYcsaggbeC5hHCtoc6/1XFMxDJH3yjcS19iz/BjJTasHX ikqH5SMHRXrM5tO5fjhxDb2+URux/Ko8dlUXFmXfWZmCIc6rmuOKM7LSpTnnc0PA 1TdOFvvaJinLyhpee+YlgpcwGY3tx5PWf2nYICXzKqJmpmCkiDLn0u/fQbLxuvMK AQNyaCmviPKna8cQeKsLHJUTZEDwIHA96TKueFC33cmfwmHLycEqY3Or+a53dJFT YIzPUcpvtUPfvNmzxgP8MtoNnS4Yq4A+iJRyniPIdWvspYjbLBZnpGS6hW9vyx9Q == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrieejgddugeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtreejnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpeektdelffevvedtledvvedugeffieffhfelgeehtedugedvgeeguedujefh jefhteenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 86472328006C; Fri, 1 May 2020 16:12:21 -0400 (EDT) From: Marius Bakke In-Reply-To: <87imhgk2po.fsf@gnu.org> References: <20200427182222.28142-1-mbakke@fastmail.com> <20200427182222.28142-4-mbakke@fastmail.com> <87imhgk2po.fsf@gnu.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Fri, 01 May 2020 22:12:19 +0200 Message-ID: <87k11v4dp8.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi, > > Marius Bakke skribis: > >> +++ b/gnu/packages/patches/guile-3.0-linux-syscalls.patch >> @@ -0,0 +1,353 @@ >> +From 9d670c8045830a64fcbc6aac6ae6fd37335a7348 Mon Sep 17 00:00:00 2001 >> +From: Marius Bakke >> +Date: Thu, 19 Mar 2020 12:49:31 +0100 >> +Subject: [PATCH] port linux syscalls >> + >> +--- >> + libguile/posix.c | 330 +++++++++++++++++++++++++++++++++++++++++++++++ >> + 1 file changed, 330 insertions(+) > > [...] > >> --- /dev/null >> +++ b/gnu/packages/patches/guile-3.0-relocatable.patch >> @@ -0,0 +1,79 @@ >> +From 5bd112b292a2b177a479099cc06e998747025587 Mon Sep 17 00:00:00 2001 >> +From: Marius Bakke >> +Date: Thu, 19 Mar 2020 12:49:02 +0100 >> +Subject: [PATCH] add guile relocatable >> + >> +--- > > For these two patches, could you preserve the same or a similar heading > as the original patches? Derp, I'm usually the one complaining about patch headers! I've fixed this now, thanks for noticing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6sgqMACgkQoqBt8qM6 VPpAPwf/UprvnSZcOc/tehUvYIHsBDCRv+DOQb1ja1uCe6uXrtGnsBnoLaozCXKf 4aes9ZDRm5rK0GwYqrQ4cPd/OUu97skVRH/yzwUBXH9GfdaZ4C9tOVc9uVpQQbYq TCeugHLHqmLmDlC+6UNMaLHmOZiUy27QkcG5K8jTELfYKFLadz+pNFsbqa7CuJcv ksnLhnWnYgQ/mrJ6/tkBCmnpqcQBZC1PMcLZcxAxelZoh6YGLcuwc+dWhLaABQSa xjLbNpnKcq/TZXAoRl6pO83dLepkZnuJSHpH5Et7YNYv1hOUqc6rbRqcZ8SAY5/o 8gUluDQMlIvSSKyzjY4riXbpXmvWvQ== =jnVn -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 16 23:46:36 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Marius Bakke Subject: bug#40908: closed (Re: [bug#40908] [PATCH core-updates 5/5] gnu: make-bootstrap: Do not export %GUILE-STATIC-STRIPPED.) Message-ID: References: <87h7wz4dip.fsf@devup.no> <20200427182027.27813-1-mbakke@fastmail.com> X-Gnu-PR-Message: they-closed 40908 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40908@debbugs.gnu.org Date: Fri, 01 May 2020 20:17:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1588364222-21952-1" This is a multi-part message in MIME format... ------------=_1588364222-21952-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40908: [PATCH core-updates 0/5] Use Guile 3.0 in the initrd which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40908@debbugs.gnu.org. --=20 40908: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40908 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1588364222-21952-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40908-done) by debbugs.gnu.org; 1 May 2020 20:16:22 +0000 Received: from localhost ([127.0.0.1]:50727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUc58-0005h7-8k for submit@debbugs.gnu.org; Fri, 01 May 2020 16:16:22 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUc57-0005gv-7R for 40908-done@debbugs.gnu.org; Fri, 01 May 2020 16:16:21 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 2F11B5C0246; Fri, 1 May 2020 16:16:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 01 May 2020 16:16:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=eaFzUimsq6jlYzzQSH77KkaL6/ h4D5Rp8xhROGWqFg8=; b=G3xIeV9bDVFdchxGTF8o1MbtTeGPhwGyNNMKpHTKKA RR5l3IV0Vzm0IQ+IUiUWANI+DlE366hQGSiea33R0roYorvePRGlnaKkw/Syojtc 3I1ZGP7Ei4q+sly3IyQaa4VDNASGDXy85iD4LX25BdofX0apLkq77KYbQdxpUfVt yLUKL2zdTQWI30oJc6jy/euw/PcfgqbWFQvMHeme7dqGrj9OBFukuRYYXayDKN08 2gE1e2RkSusePHALqWaAKt4P+U29JtTEFRsfVRYQpWEhe0cPSg5B9aGLxG/ax+n6 yWbITrwpEnI8jh5OYCCD1ViygOi3ntw0jdE4fmMDgbvA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=eaFzUi msq6jlYzzQSH77KkaL6/h4D5Rp8xhROGWqFg8=; b=YXaZ0hpJ2cd2lnSJyT9996 FRY+qhQAnkprXPXLTZGJjs02QObaZgRiRhv19hX5IQvKVyjHMRXjEN/Vh0XPvYhZ 4Qu3GewGhbggeJYjQ9vaA2C1Ke0d+QxSeEu5U9zJbOVEP6Qm7Kgy/G4dg6OhlZDj L0lbH0D+WfGQ2rk+ZOJ77VZ4Icu11Oxf5xJHFem/YKvnC919Dfa5I1esq81nhkFB f9c0VA50y7djEh9dpdHuB45sxLu8YllRv0I7TMLn1oyC5/lhQDerlfGww411h+O3 XXFBwI0rPpl+DrAqbRmuGBaix1hYZ8RwyPZneLZSs7fbnsTWmMybCxy0ycXKV/7Q == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrieejgddugeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtreejnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpeektdelffevvedtledvvedugeffieffhfelgeehtedugedvgeeguedujefh jefhteenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id B30F3328005D; Fri, 1 May 2020 16:16:15 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#40908] [PATCH core-updates 5/5] gnu: make-bootstrap: Do not export %GUILE-STATIC-STRIPPED. In-Reply-To: <87ees4k2mj.fsf@gnu.org> References: <20200427182222.28142-1-mbakke@fastmail.com> <20200427182222.28142-5-mbakke@fastmail.com> <87ees4k2mj.fsf@gnu.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Fri, 01 May 2020 22:16:14 +0200 Message-ID: <87h7wz4dip.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40908-done Cc: 40908-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi, > > Marius Bakke skribis: > >> * gnu/packages/make-bootstrap.scm (%guile-static-stripped): Remove expor= t. >> --- >> gnu/packages/make-bootstrap.scm | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstr= ap.scm >> index 443e778824..981c7aa24e 100644 >> --- a/gnu/packages/make-bootstrap.scm >> +++ b/gnu/packages/make-bootstrap.scm >> @@ -56,9 +56,7 @@ >> %guile-bootstrap-tarball >> %mescc-tools-bootstrap-tarball >> %mes-bootstrap-tarball >> - %bootstrap-tarballs >> - >> - %guile-static-stripped)) > > Are you sure it=E2=80=99s unused? > > Actually, what about simply adding =E2=80=98%guile-3.0-static-stripped=E2= =80=99 right in > this file? I think it would work, right? And we could also keep > =E2=80=98make-guile-static=E2=80=99 private. Right, that is better. Done! > Apart from this, the patch series LGTM! Pretty exciting to have a JIT > in the initrd. ;-) Heh, my main motivation for these patches was to remove scary warnings about incompatible bytecode during boot, but we also boot faster as a side effect! :-) Patches pushed! I think we are pretty close to actually merging this branch now..! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6sg44ACgkQoqBt8qM6 VPrqeQgAz0T0eorKNIJ10EIpUBYv+bUSsvmPYP/rat2ilsPb0Wn6rm/ICvLs+tsE hmA4LtFS6PSgoe9H1I5nM5lHBXTEi7JY6g/gUXMUk2PWPzlsVvBYc5hN0anEt+tn +XANfaxFAYWYcCjh/RtEU1Io8HF3JW4vDT72Z0ZXls0xIQD9Q7Okg5u0jt90fe7q vwG8c+twJAN4cg8sH798bMh3biTJZmFQXclu01AgEmXIN4vULUa4ItqCfk+1GWQR dORQ8gTOD0ZiXYxdFcdVjCE4jpVr0VmVEKeB3T1PLlOt95JJEAx/Dy8p9yV2957m ZchoEqCwq2e/ybmBDQoUF57lSWnj1Q== =eY6v -----END PGP SIGNATURE----- --=-=-=-- ------------=_1588364222-21952-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Apr 2020 18:20:49 +0000 Received: from localhost ([127.0.0.1]:38074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8N4-0004U4-En for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:20:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:35327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT8Mw-0004Tq-VU for submit@debbugs.gnu.org; Mon, 27 Apr 2020 14:20:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35356) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT8Mv-0006dy-8D for guix-patches@gnu.org; Mon, 27 Apr 2020 14:20:38 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT8Mr-0001TA-Aj for guix-patches@gnu.org; Mon, 27 Apr 2020 14:20:37 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:55623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jT8Mq-0001EJ-Fy for guix-patches@gnu.org; Mon, 27 Apr 2020 14:20:32 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 6D8D476C for ; Mon, 27 Apr 2020 14:20:29 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Apr 2020 14:20:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=jQc9hKr22dKEq9rIjYinjfuA9+ eT6ohNqp3vC+gC+Vs=; b=JWOcHrXYXrRtE0Jah0CN9I3yec+P+o6n+hc/OO+A7z 63ekCxc3QOtuhUSfiMa56vKNWdqS5us/hAytX1nqzjJhN9UOYMVdver09xi63JvJ VHOBwZOFyLvtD6pReaaFI4ZM+etSRfTitw87F91nTWV4JTvCjOI7dThwNQ2P6DyQ vRBX6wwkVDWz1HNZmwM3IUF0kcUiEvv62L7SwxE7NuBT+nLXBfLrJmTWf/7jvSnF R7vl8ZFVMdIl3hjZqUJLrnErT/wS398nypfHhBKe6rfZ/csf4ewJg/h2qQibRKjJ 3u9FUYHzr8HWFQx53xZrSB/T1Hy0t2CQZZ1vYywOf5oA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=jQc9hKr22dKEq9rIj YinjfuA9+eT6ohNqp3vC+gC+Vs=; b=af8kTI0dyp/A8ZtDdTRRjA5jtRREdyB54 dHsIajkF+78LnWO4txngVI+phmQJqEpQxIemdlEsVUNstTvVFmJJazWTO9abI0de KG7GmKDVB2Iv1x+NBhzmZlYehye4EUm0tBANHunUqEqECNQg3/J3S8tRS+qhYrb3 aaT0fVa97IxjanmA4p1E8DHBU9GFJ7PHYOX2xY0mudPQMefYfclB5Wcb0CNYCa9v oER8oRm5yxwVQeacK0XCr3nER8P8LKxSvb51xVI+J05w8OC3XK8vhGnRX2PR4Mre fLHP0uq3uFqavsXHhSK2x6jKw5Fq6fQUiGYpleZ1mF0jqQtF6NhHg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrheelgdduvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepofgrrhhiuhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhm rghilhdrtghomheqnecukfhppeekgedrvddtvddrieekrdejheenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgr ihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id AC4AA3065E77 for ; Mon, 27 Apr 2020 14:20:28 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH core-updates 0/5] Use Guile 3.0 in the initrd Date: Mon, 27 Apr 2020 20:20:27 +0200 Message-Id: <20200427182027.27813-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.147.123.25; envelope-from=mbakke@fastmail.com; helo=wout2-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 14:20:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.123.25 X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) Guix, These patches changes the initrd to use Guile 3.0. By default it uses %GUILE-STATIC-STRIPPED from (gnu packages make-bootstrap), which on the core-updates branch refers to Guile 2.0. It is suboptimal to define this new static Guile variant straight in (gnu system linux-initrd), but adding it to (gnu packages guile) would cause a cyclic module reference with (gnu packages make-bootstrap). WDYT? Marius Bakke (5): gnu: %guile-static: Rewrite in terms of 'make-guile-static'. gnu: %guile-static-stripped: Rewrite in terms of 'make-guile-static-stripped'. gnu: make-bootstrap: Export MAKE-GUILE-STATIC and MAKE-GUILE-STATIC-STRIPPED. linux-initrd: Use Guile 3.0. gnu: make-bootstrap: Do not export %GUILE-STATIC-STRIPPED. gnu/local.mk | 7 +- gnu/packages/make-bootstrap.scm | 161 ++++---- .../patches/guile-2.2-default-utf8.patch | 82 ++++ .../patches/guile-3.0-linux-syscalls.patch | 353 ++++++++++++++++++ .../patches/guile-3.0-relocatable.patch | 79 ++++ gnu/system/linux-initrd.scm | 10 +- 6 files changed, 611 insertions(+), 81 deletions(-) create mode 100644 gnu/packages/patches/guile-2.2-default-utf8.patch create mode 100644 gnu/packages/patches/guile-3.0-linux-syscalls.patch create mode 100644 gnu/packages/patches/guile-3.0-relocatable.patch -- 2.26.2 ------------=_1588364222-21952-1--