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

commit 6b6b1ba58eed82e8e97be990dca3d4afdc88a188
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Wed Feb 12 19:35:35 2025 +0800

    gnu: bash-static: Fix cross-compiling for glibc@2.41.
    
    * gnu/packages/bash.scm (static-bash)[arguments]<#:configure-flags>: When
    cross-compiling, Add bash_cv_getenv_redef=no.
    
    Change-Id: I8105e91831dfdcce4e5494b3588ab8431dbaf5a8
---
 gnu/packages/bash.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index c8c1382136..79e58d6ac5 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -325,6 +325,16 @@ without modification.")
       (arguments
        (substitute-keyword-arguments
            `(#:allowed-references ("out") ,@(package-arguments bash))
+         ((#:configure-flags flags '())
+          ;; XXX: when Update glibc from 2.40 to 2.41,
+          ;; need this flag to compile successfully.
+          ;; Otherwise, an error will be reported:
+          ;; multiple definition of `getenv'
+          (if (%current-target-system)
+              `(cons
+                "bash_cv_getenv_redef=no"
+                ,flags)
+              flags))
          ((#:phases phases)
           #~(modify-phases #$phases
               (add-after 'strip 'remove-everything-but-the-binary

Reply via email to