From b81d8d661580374e011e52e5e11923e79de6caec Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Thu, 11 Oct 2007 19:40:21 +0300 Subject: [PATCH] Fixed glibc multilib case creating a proper ld.so.conf - The conditional that checked what kind of ld.so,conf has to be generated was using $slibdir = lib64 in postmake to check if it is a 64bit build, and because multilib support was hardcoded for 64 it injected a corresponding ld.so.conf. Now that we implemented multilib support by using buildloops $slibdir gets altered to lib32 in the second loop while building 32bit libs. This commit will change the test checking if multilib is enabled for the target instead of using $slibdir. It also adopts the new filesystem layout to the ld.so.conf. --- base/glibc/glibc.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf index 6734ac772..9779cce52 100644 --- a/base/glibc/glibc.conf +++ b/base/glibc/glibc.conf @@ -167,17 +167,22 @@ glibc_postmake() # Install ld.so.conf # - if [ $slibdir = lib64 ] ; then + if [ "$SDECFG_MULTILIB" == 1 ] ; then cat > $root/etc/ld.so.conf <<-EOT /lib64 + /lib32 /lib /usr/lib64 + /usr/lib32 /usr/lib /usr/*/lib64 + /usr/*/lib32 /usr/*/lib /opt/*/lib64 + /opt/*/lib32 /opt/*/lib /usr/local/lib64 + /usr/local/lib32 /usr/local/lib EOT else