linamh/sys-libs/glibc/files/2.4/glibc-gentoo-libdir.patch

29 lines
991 B
Diff
Raw Normal View History

--- glibc-2.4/sysdeps/unix/sysv/linux/configure
+++ glibc-2.4/sysdeps/unix/sysv/linux/configure
@@ -224,23 +224,12 @@
# in /lib and /etc.
case "$prefix" in
/usr | /usr/)
- # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib.
- # Allow earlier configure scripts to handle libc_cv_slibdir, libdir,
- # and libc_cv_localedir.
- test -n "$libc_cv_slibdir" || \
- case $machine in
- sparc/sparc64 | x86_64 | powerpc/powerpc64 | s390/s390-64)
- libc_cv_slibdir="/lib64"
+ libc_cv_slibdir="/@GENTOO_LIBDIR@"
if test "$libdir" = '${exec_prefix}/lib'; then
- libdir='${exec_prefix}/lib64';
+ libdir='${exec_prefix}/@GENTOO_LIBDIR@'
# Locale data can be shared between 32bit and 64bit libraries
libc_cv_localedir='${exec_prefix}/lib/locale'
fi
- ;;
- *)
- libc_cv_slibdir="/lib"
- ;;
- esac
# Allow the user to override the path with --sysconfdir
if test $sysconfdir = '${prefix}/etc'; then
libc_cv_sysconfdir=/etc