diff options
| author | Leo Le Bouter <lle-bout@zaclys.net> | 2021-02-06 20:02:31 +0100 |
|---|---|---|
| committer | Chris Marusich <cmmarusich@gmail.com> | 2021-03-10 23:01:59 -0800 |
| commit | 638bfff85397431af9d53e2604fc83d5eaf3945e (patch) | |
| tree | 9e001f94904b46f01bd2b37a162655ee4b142ecb | |
| parent | 458022fb6973c5377bc50a96c9d957aab6124328 (diff) | |
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)[patches]: Add it.
(glibc-2.30)[patches]: Add it.
(glibc-2.29)[patches]: Add it.
(glibc-2.28)[patches]: Add it.
(glibc-2.27)[patches]: Add it.
Signed-off-by: Chris Marusich <cmmarusich@gmail.com>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/base.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/glibc-ldd-powerpc.patch | 10 |
3 files changed, 17 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 6c6d1ba47b..2977d52fbd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1088,6 +1088,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 5c65abe1bc..91e709c5b6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Vitaliy Shatrov <D0dyBo0D0dyBo0@protonmail.com> ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com> +;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -679,6 +680,7 @@ the store.") "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn")) (patches (search-patches "glibc-ldd-x86_64.patch" "glibc-dl-cache.patch" + "glibc-ldd-powerpc.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" @@ -943,6 +945,7 @@ with the Linux kernel.") (base32 "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-ldd-powerpc.patch" "glibc-CVE-2019-19126.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" @@ -961,6 +964,7 @@ with the Linux kernel.") (base32 "0jzh58728flfh939a8k9pi1zdyalfzlxmwra7k0rzji5gvavivpk")) (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-ldd-powerpc.patch" "glibc-CVE-2019-7309.patch" "glibc-CVE-2019-9169.patch" "glibc-2.29-git-updates.patch" @@ -981,6 +985,7 @@ with the Linux kernel.") (base32 "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-ldd-powerpc.patch" "glibc-2.28-git-fixes.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" @@ -1000,6 +1005,7 @@ with the Linux kernel.") (base32 "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji")) (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-ldd-powerpc.patch" "glibc-2.27-git-fixes.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" diff --git a/gnu/packages/patches/glibc-ldd-powerpc.patch b/gnu/packages/patches/glibc-ldd-powerpc.patch new file mode 100644 index 0000000000..8e899ee99b --- /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"_ + |