18/18: squash glibc: Fix ldd path on powerpc*.

[guix-commits]

marusich pushed a commit to branch wip-ppc64le-for-master
in repository guix.

commit f566f60f8d281c35cf60d4fa9e26b3e0b0f22dea
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Mar 11 13:42:54 2021 +0200

    squash glibc: Fix ldd path on powerpc*.
    
    * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash,
    glibc-final)[native-inputs]: Add patch conditionally.
---
 gnu/packages/commencement.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a5940a5..d4511ed 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3315,7 +3315,11 @@ memoized as a function of '%current-system'."
      `(("bison" ,bison-boot0)
        ("texinfo" ,texinfo-boot0)
        ("perl" ,perl-boot0)
-       ("python" ,python-boot0)))
+       ("python" ,python-boot0)
+       ,@(if (target-powerpc?)
+           `(("powerpc64le-patch" ,@(search-patches
+                                      "glibc-ldd-powerpc.patch")))
+           '())))
     (inputs
      `( ;; The boot inputs.  That includes the bootstrap libc.  We don't want
        ;; it in $CPATH, hence the 'pre-configure' phase above.
@@ -3466,6 +3470,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
 
    ;; This time we need 'msgfmt' to install all the libc.mo files.
    (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
+                     ,@(if (target-powerpc?)
+                         `(("powerpc64le-patch" ,@(search-patches
+                                                    
"glibc-ldd-powerpc.patch")))
+                         '())
                     ("gettext" ,gettext-boot0)))
 
    (propagated-inputs