From a128060e48a7e9618c5a5520a31a4c2ea99e953d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Dec 2020 20:35:08 +0100
Subject: [PATCH] glibc: drop unneeded rtldlist hack, noarch, rebuild

since we have lib64 symlinks in place and so on, the default
rtldlist is actually sufficient

while at it, fix the 32-bit dynlinker on ppc64 elfv2
---
 srcpkgs/glibc/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index a24cf402c18..dda99ba608d 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.30
-revision=1
+revision=2
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -139,17 +139,13 @@ do_install() {
 	# ldd is a bash script, so make it run as such.
 	replace_interpreter bash ${DESTDIR}/usr/bin/ldd
 
-	rtldlist=""
-	# On x86_64, add dynamic linker's 32bit version to ldd,
-	# on ppc64 substitute with our own dynamic linker path
+	# wrong 32bit dynamic linker when using elfv2 ABI
 	case "$XBPS_TARGET_MACHINE" in
-		x86_64) rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2";;
-		ppc64|ppc64le) rtldlist="/lib/ld64.so.2";;
+		ppc64*)
+			vsed -i '/RTLDLIST=/s/ld.so.2/ld.so.1/g' \
+				${DESTDIR}/usr/bin/ldd
+			;;
 	esac
-	if [ -n "$rtldlist" ]; then
-		sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
-			${DESTDIR}/usr/bin/ldd
-	fi
 
 	install -d ${DESTDIR}/etc/ld.so.conf.d
 	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
@@ -197,7 +193,6 @@ glibc-devel_package() {
 	}
 }
 glibc-locales_package() {
-	archs="noarch"
 	conf_files="/etc/default/libc-locales"
 	short_desc+=" - locale data files"
 	pkg_install() {