efraim pushed a commit to branch wip-ppc64le-for-master in repository guix.
commit 2712703474137310c2cf4f1a3530500188b37b9f Author: Leo Le Bouter <[email protected]> AuthorDate: Sat Feb 6 20:02:31 2021 +0100 gnu: glibc: Fix ldd path on powerpc*. 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. Signed-off-by: Chris Marusich <[email protected]> --- gnu/local.mk | 1 + gnu/packages/base.scm | 16 +++++++++++++++- gnu/packages/patches/glibc-ldd-powerpc.patch | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/local.mk b/gnu/local.mk index 39037d3..d63249e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1090,6 +1090,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-locales-2.28.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9aa69cf..7c5ac61 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <[email protected]> ;;; Copyright © 2014 Alex Kost <[email protected]> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <[email protected]> -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <[email protected]> +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <[email protected]> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <[email protected]> ;;; Copyright © 2016, 2018 Alex Vong <[email protected]> ;;; Copyright © 2017 Rene Saavedra <[email protected]> @@ -15,6 +15,8 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2018, 2019 Ricardo Wurmus <[email protected]> ;;; Copyright © 2020 Vitaliy Shatrov <[email protected]> +;;; Copyright © 2020 Chris Marusich <[email protected]> +;;; Copyright © 2021 Leo Le Bouter <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -890,6 +892,14 @@ the store.") files))) #t))) + ,@(if (target-powerpc?) + '((add-after 'unpack 'apply-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "powerpc64le-patch"))) + (invoke "patch" "--force" "-p1" + "-i" patch))))) + '()) ,@(if (hurd-target?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -911,6 +921,10 @@ the store.") ("gettext" ,gettext-minimal) ("python" ,python-minimal) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ,@(if (hurd-target?) `(("mig" ,mig) ("perl" ,perl)) diff --git a/gnu/packages/patches/glibc-ldd-powerpc.patch b/gnu/packages/patches/glibc-ldd-powerpc.patch new file mode 100644 index 0000000..8e899ee --- /dev/null +++ b/gnu/packages/patches/glibc-ldd-powerpc.patch @@ -0,0 +1,10 @@ +diff -r -U3 a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed +--- a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 1970-01-01 01:00:00.000000000 +0100 ++++ b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 2020-02-29 00:15:41.080000000 +0100 +@@ -11,5 +11,5 @@ + # this works for /lib64/ld64.so.x and /lib/ld.so.x as input + s_lib64_lib_ + s_64\.so_\.so_ +-s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \164\264\3"_ ++s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \1\264\3"_ +
