amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc: Fix ldd path on powerpc*.

Browse source 
This should avoid some problems, such as "not a dynamic executable" errors.

* gnu/packages/patches/glibc-ldd-powerpc.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/base.scm: (glibc)[native-inputs]: Add it.
[arguments]: When building for powerpc* apply it.
* gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash,
glibc-final)[native-inputs]: Add patch conditionally.

This patch has been adjusted to apply to master.

Signed-off-by: Chris Marusich <cmmarusich@gmail.com>
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Leo Le Bouter 2021-02-06 20:02:31 +01:00 • committed by Chris Marusich
parent cac88b28b8
commit 6e98e9ca92
No known key found for this signature in database
GPG key ID: DD409A15D822469D
4 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/commencement.scm
View file

@ -3313,7 +3313,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.
@ -3464,6 +3468,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