From patchwork Mon Apr 27 18:22:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 21686 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F30A227BBE4; Mon, 27 Apr 2020 19:28:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8996B27BBE1 for ; Mon, 27 Apr 2020 19:28:00 +0100 (BST) Received: from localhost ([::1]:58158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT8U4-000335-0q for patchwork@mira.cbaines.net; Mon, 27 Apr 2020 14:28:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT8PH-0001p4-1P for guix-patches@gnu.org; Mon, 27 Apr 2020 14:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT8PG-00037K-H0 for guix-patches@gnu.org; Mon, 27 Apr 2020 14:23:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jT8PG-00037F-2j for guix-patches@gnu.org; Mon, 27 Apr 2020 14:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jT8PF-0004Zr-VA for guix-patches@gnu.org; Mon, 27 Apr 2020 14:23:01 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)