06/14: REMOVEME gnu: commencement: bash-mesboot: Avoid rebuild.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit ee3d7b313e77bd994bc4f5139f1767a949a24390
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 3 20:18:03 2024 +0100

    REMOVEME gnu: commencement: bash-mesboot: Avoid rebuild.
    
    XXX This avoids a boot0-world rebuild, for the gcc-14 transition we only 
need
    to rebuild starting from gcc-boot0.
    
    IWBN if we could program commencement in a way that it's more robust wrt 
base
    package changes (or more flexible to counter such changes?).
    
    Before we point the build farm to core-packages-team, we probably want to
    remove this patch.
    
    * gnu/packages/commencement.scm (bash-mesboot): Change into package 
definition
    in order to undo #:configure-flags change made in bash-minimal.
    
    Change-Id: I2517e7fd9e2fa3579279b2c85c4f2121ceee1a76
---
 gnu/packages/commencement.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 79342e213a..c5af5b6109 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1851,7 +1851,22 @@ exec " gcc "/bin/" program
 ;; These packages are needed to complete the rest of the bootstrap.
 ;; In the future, Gash et al. could handle it directly, but it's not
 ;; ready yet.
-(define bash-mesboot (mesboot-package "bash-mesboot" static-bash))
+(define bash-mesboot
+  (let ((bash (mesboot-package "bash-mesboot" static-bash)))
+    (package
+      (inherit bash)
+      (arguments
+       (substitute-keyword-arguments (package-arguments bash)
+         ;; XXX REMOVEME Avoid a boot0-world rebuild for now by removing this
+         ;; unnecessary gcc-14 fix.
+         ((#:configure-flags flags)
+          `(cons*
+            "--disable-shared" "LDFLAGS=-static"
+            (list
+             ,@(fold delete
+                     (primitive-eval (gexp->approximate-sexp flags))
+                     '("CFLAGS=-g -O2 -Wno-implicit-function-declaration"
+                       "--disable-shared" "LDFLAGS=-static"))))))))))
 (define sed-mesboot (mesboot-package "sed-mesboot" sed))
 
 ;; "sed" from Gash-Utils lacks the 'w' command as of 0.2.0.