From 7d8cc165de7081cfce2e7fe8a2946932ae43abbc Mon Sep 17 00:00:00 2001
From: Ivan Max <mixython@gmail.com>
Date: Sat, 14 Sep 2024 19:02:24 +0300
Subject: [PATCH] cgct/glibc-cgct: improvements (#288)

removing rpath setting in setup-cgct script
fixing paths to dynamic linker in ldd
---
 cgct/glibc-cgct/PKGBUILD   | 6 ++++--
 cgct/glibc-cgct/setup-cgct | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cgct/glibc-cgct/PKGBUILD b/cgct/glibc-cgct/PKGBUILD
index 816b56da2..1faa9f860 100644
--- a/cgct/glibc-cgct/PKGBUILD
+++ b/cgct/glibc-cgct/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=glibc-cgct
 pkgver=2.40
-pkgrel=0
+pkgrel=1
 pkgdesc="GNU C Library for CGCT (only for Linux)"
 arch=(x86_64)
 url='https://www.gnu.org/software/libc/'
@@ -10,7 +10,7 @@ source=(https://ftp.gnu.org/gnu/libc/glibc-$pkgver.tar.xz
 	setup-cgct)
 sha256sums=('19a890175e9263d748f627993de6f4b1af9cd21e03f080e4bfb3a1fac10205a2'
             'a687fd304c85dbcb9324a917c83c68333f45bc27424ea7c49449e840306c416d'
-            '0c7376ccfddf46b46eba503685a905840cedb1ebd6f04d3c1935edb08e74c1ec')
+            '15dcc4a741f0a347252aa26963bb0f1a7bdd5dbfc2690827600d6acb5dbd2aa9')
 groups=('cgct')
 
 prepare() {
@@ -18,6 +18,8 @@ prepare() {
 		patch -Np1 -i ${srcdir}/$i
 	done
 
+	rm ./glibc-${pkgver}/sysdeps/unix/sysv/linux/x86_64/configure*
+
 	mkdir -p glibc-build || true
 }
 
diff --git a/cgct/glibc-cgct/setup-cgct b/cgct/glibc-cgct/setup-cgct
index 1e10ebb0d..2af8c710f 100644
--- a/cgct/glibc-cgct/setup-cgct
+++ b/cgct/glibc-cgct/setup-cgct
@@ -24,7 +24,7 @@ LD_LIB=$(ls ${CGCT_DIR}/lib/ld-* 2> /dev/null)
 echo "Setting up CGCT..."
 
 for f in $(find "${CGCT_DIR}"/{aarch64,arm,x86_64,i686}/{bin,lib/gcc} -type f -exec grep -IL . "{}" \; | grep -v -e '\.a' -e '\.o' -e '\.so'); do
-	patchelf --set-rpath "$RPATH_LIBS" --set-interpreter "$LD_LIB" "$f"
+	patchelf --set-interpreter "$LD_LIB" "$f"
 	echo "Configured '${f}'"
 done