wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 07:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glibc: drop unneeded rtldlist hack, noarch, rebuild

Browse source 
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
This commit is contained in:
q66 2020-12-23 20:35:08 +01:00
parent 2646b6ebde
commit a128060e48
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
srcpkgs/glibc/template
View file

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