Browse Source

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.
early
Christian Wiese 18 years ago
parent
commit
b81d8d6615
  1. 7
      base/glibc/glibc.conf

7
base/glibc/glibc.conf

@ -167,17 +167,22 @@ glibc_postmake()
# Install ld.so.conf # Install ld.so.conf
# #
if [ $slibdir = lib64 ] ; then if [ "$SDECFG_MULTILIB" == 1 ] ; then
cat > $root/etc/ld.so.conf <<-EOT cat > $root/etc/ld.so.conf <<-EOT
/lib64 /lib64
/lib32
/lib /lib
/usr/lib64 /usr/lib64
/usr/lib32
/usr/lib /usr/lib
/usr/*/lib64 /usr/*/lib64
/usr/*/lib32
/usr/*/lib /usr/*/lib
/opt/*/lib64 /opt/*/lib64
/opt/*/lib32
/opt/*/lib /opt/*/lib
/usr/local/lib64 /usr/local/lib64
/usr/local/lib32
/usr/local/lib /usr/local/lib
EOT EOT
else else

Loading…
Cancel
Save