on %{arm} disable GLIBC_ABI_DT_RELR enforcement when DT_RELR is used

temporary fix to get widevine working. avoids error:

DT_RELR without GLIBC_ABI_DT_RELR dependency

diff --git a/arm-widevine-compat.patch b/arm-widevine-compat.patch
new file mode 100644 (file)
index 0000000..4d4c8c7
--- /dev/null
+++ b/arm-widevine-compat.patch
@@ -0,0 +1,11 @@
+--- glibc-2.36/elf/dl-version.c.orig   2022-07-30 00:03:09.000000000 +0200
++++ glibc-2.36/elf/dl-version.c        2023-01-05 00:26:06.757658528 +0100
+@@ -362,7 +362,7 @@
+   /* When there is a DT_VERNEED entry with libc.so on DT_NEEDED, issue
+      an error if there is a DT_RELR entry without GLIBC_ABI_DT_RELR
+      dependency.  */
+-  if (dyn != NULL
++  if (0 && dyn != NULL
+       && map->l_info[DT_NEEDED] != NULL
+       && map->l_info[DT_RELR] != NULL
+       && __glibc_unlikely (!map->l_dt_relr_ref))

diff --git a/glibc.spec b/glibc.spec
index 09a440235101d80a3edcb70f9ec2f36880b6a134..d12f00e4d95395e1cb040eed4cf066dd10ebe962 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -97,6 +97,7 @@ Patch19:      %{name}-ZA_collate.patch
 Patch23:       %{name}-pt_pax.patch
 
 Patch30:       glibc-rh1124987.patch
+Patch31:       arm-widevine-compat.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
 BuildRequires: autoconf >= 2.69
@@ -972,6 +973,9 @@ exit 1
 %patch23 -p0
 
 %patch30 -p1
+%ifarch %{arm}
+%patch31 -p1
+%endif
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f