[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-ppc64le-for-master updated: squash glibc: Fix ldd path on pow
From: |
guix-commits |
Subject: |
branch wip-ppc64le-for-master updated: squash glibc: Fix ldd path on powerpc*. |
Date: |
Thu, 11 Mar 2021 06:44:48 -0500 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch wip-ppc64le-for-master
in repository guix.
The following commit(s) were added to refs/heads/wip-ppc64le-for-master by this
push:
new ee7e81a squash glibc: Fix ldd path on powerpc*.
ee7e81a is described below
commit ee7e81a54f8d15c3b80428425d17627bcb189583
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-ppc64le-for-master updated: squash glibc: Fix ldd path on powerpc*.,
guix-commits <=