Skip to content

Commit

Permalink
cgct/glibc-cgct: improvements (#288)
Browse files Browse the repository at this point in the history
removing rpath setting in setup-cgct script
fixing paths to dynamic linker in ldd
  • Loading branch information
Maxython authored Sep 14, 2024
1 parent 81b4586 commit 7d8cc16
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions cgct/glibc-cgct/PKGBUILD
Original file line number Diff line number Diff line change
@@ -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/'
Expand All @@ -10,14 +10,16 @@ source=(https://ftp.gnu.org/gnu/libc/glibc-$pkgver.tar.xz
setup-cgct)
sha256sums=('19a890175e9263d748f627993de6f4b1af9cd21e03f080e4bfb3a1fac10205a2'
'a687fd304c85dbcb9324a917c83c68333f45bc27424ea7c49449e840306c416d'
'0c7376ccfddf46b46eba503685a905840cedb1ebd6f04d3c1935edb08e74c1ec')
'15dcc4a741f0a347252aa26963bb0f1a7bdd5dbfc2690827600d6acb5dbd2aa9')
groups=('cgct')

prepare() {
for i in *.patch; do
patch -Np1 -i ${srcdir}/$i
done

rm ./glibc-${pkgver}/sysdeps/unix/sysv/linux/x86_64/configure*

mkdir -p glibc-build || true
}

Expand Down
2 changes: 1 addition & 1 deletion cgct/glibc-cgct/setup-cgct
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7d8cc16

Please sign in to comment.