11/58: gnu: libstdc++: Support the 64bit Hurd.

[guix-commits]

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

commit 7747b95f6a663fee3fa27e2c2188b48abf466077
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Mon Nov 4 19:58:01 2024 +0100

    gnu: libstdc++: Support the 64bit Hurd.
    
    * gnu/packages/gcc.scm (make-libstdc++)[arguments]: When building for the
    64bit Hurd, add stage patch-hurd64.
    
    Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602
---
 gnu/packages/gcc.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index c9e475b676..64ba37fd69 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1024,7 +1024,15 @@ using compilers other than GCC."
                   (("/lib64") "/lib")))))
           (add-before 'configure 'chdir
             (lambda _
-              (chdir "libstdc++-v3"))))
+              (chdir "libstdc++-v3")))
+          #$@(let ((version (package-version gcc)))
+               (if (target-hurd64?)
+                   #~((add-after 'unpack 'patch-hurd64
+                        (lambda _
+                          (substitute* "libstdc++-v3/src/c++20/tzdb.cc"
+                            (("#if ! defined _GLIBCXX_ZONEINFO_DIR")
+                             "#if __GNU__ || ! defined 
_GLIBCXX_ZONEINFO_DIR")))))
+                   '())))
 
       #:configure-flags '`("--disable-libstdcxx-pch"
                            ,(string-append "--with-gxx-include-dir="