From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sGpbILhd/F7EAwAA0tVLHw (envelope-from ) for ; Wed, 01 Jul 2020 09:56:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SB82HLhd/F5lfgAAB5/wlQ (envelope-from ) for ; Wed, 01 Jul 2020 09:56:08 +0000 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 C33B89403C5 for ; Wed, 1 Jul 2020 09:56:07 +0000 (UTC) Received: from localhost ([::1]:47726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqZTJ-00048o-TO for larch@yhetil.org; Wed, 01 Jul 2020 05:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqZTF-000476-Uc for guix-patches@gnu.org; Wed, 01 Jul 2020 05:56:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqZTF-0001dF-Kz for guix-patches@gnu.org; Wed, 01 Jul 2020 05:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jqZTF-0002Hc-JD for guix-patches@gnu.org; Wed, 01 Jul 2020 05:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42146] [PATCH 6/6] gnu: glibc-mesboot0: Fixup the fixup-configure phase. References: <20200630220913.14665-1-kuba@kadziolka.net> In-Reply-To: <20200630220913.14665-1-kuba@kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jul 2020 09:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42146@debbugs.gnu.org Received: via spool by 42146-submit@debbugs.gnu.org id=B42146.15935973308738 (code B ref 42146); Wed, 01 Jul 2020 09:56:01 +0000 Received: (at 42146) by debbugs.gnu.org; 1 Jul 2020 09:55:30 +0000 Received: from localhost ([127.0.0.1]:52317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqZSk-0002Gs-1s for submit@debbugs.gnu.org; Wed, 01 Jul 2020 05:55:30 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:37738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqZSh-0002Gg-UR for 42146@debbugs.gnu.org; Wed, 01 Jul 2020 05:55:28 -0400 Received: (qmail 19561 invoked by uid 1009); 1 Jul 2020 11:55:25 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25859. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.034343 secs); 01 Jul 2020 09:55:25 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 1 Jul 2020 11:55:25 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Wed, 1 Jul 2020 11:55:23 +0200 Message-Id: <20200701095523.9501-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.49 X-TUID: b5DDiJBO93MX * gnu/packages/commencement.scm (glibc-mesboot0)[fixup-configure]: Don't repeat substitution. Fix indentation. --- This is an interesting cleanup commit. I believe this concludes a nice sampling of the consequences of this patch, and thus subsequent fixups are unlikely to benefit from a review. I will be pushing my work to https://github.com/NieDzejkob/guix/tree/core-updates gnu/packages/commencement.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 295a378d11..837f4e2ecc 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1418,19 +1418,17 @@ ac_cv_c_float_format='IEEE (little-endian)' (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) (apply invoke "./configure" configure-flags))) - (add-after 'configure 'fixup-configure - (lambda _ - (let* ((out (assoc-ref %outputs "out")) - (bash (assoc-ref %build-inputs "bash")) - (shell (string-append bash "/bin/bash"))) - (substitute* "config.make" - (("INSTALL = scripts/") "INSTALL = $(..)./scripts/")) - (substitute* "config.make" - (("INSTALL = scripts/") "INSTALL = $(..)./scripts/") - (("BASH = ") (string-append - "SHELL = " shell " - BASH = "))) - #t)))))))) + (add-after 'configure 'fixup-configure + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bash (assoc-ref %build-inputs "bash")) + (shell (string-append bash "/bin/bash"))) + (substitute* "config.make" + (("INSTALL = scripts/") "INSTALL = $(..)./scripts/") + (("BASH = ") (string-append + "SHELL = " shell " +BASH = "))) + #t)))))))) (define gcc-mesboot0 (package -- 2.26.2