[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: gnu: glibc: Fix ldd path on powerpc*.
From: |
guix-commits |
Subject: |
04/04: gnu: glibc: Fix ldd path on powerpc*. |
Date: |
Sat, 6 Feb 2021 21:38:22 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit d58e6fb943fe3be7ae51ae44c5705d90dbdcfb63
Author: Leo Le Bouter <lle-bout@zaclys.net>
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)[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>
---
gnu/local.mk | 1 +
gnu/packages/base.scm | 6 ++++++
gnu/packages/patches/glibc-ldd-powerpc.patch | 10 ++++++++++
3 files changed, 17 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 612ecbe..a32fdb4 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 55cfc0f..0f74380 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.
;;;
@@ -718,6 +719,7 @@ the store.")
#t))
(modules '((guix build utils)))
(patches (search-patches "glibc-ldd-x86_64.patch"
+ "glibc-ldd-powerpc.patch"
"glibc-hidden-visibility-ldconfig.patch"
"glibc-versioned-locpath.patch"
"glibc-allow-kernel-2.6.32.patch"
@@ -963,6 +965,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"
@@ -981,6 +984,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"
@@ -1001,6 +1005,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"
@@ -1020,6 +1025,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 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"_
+