From fa2184aeac38124e96c4e7348a7dc88f1b16d541 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 21 Nov 2008 09:58:43 +0100 Subject: [PATCH] glibc32: add back lib32 dirs into ld.so.conf. --HG-- extra : convert_revision : 775488ace10ef250f5711896c1b8a2afc74d377c --- templates/glibc32.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/glibc32.tmpl b/templates/glibc32.tmpl index c2e584dfbc1..47bc312f39e 100644 --- a/templates/glibc32.tmpl +++ b/templates/glibc32.tmpl @@ -75,10 +75,11 @@ post_install() mv -v $destdir/usr/lib/* $destdir/usr/lib32/ rmdir $destdir/usr/lib - # Make some symlinks from /lib32 in /lib, to make gcc-multilib happy. - cd $destdir/lib && ln -s ../lib32/libc_nonshared.a . cd $destdir/lib && ln -s ../lib32/ld-linux.so.2 . - cd $destdir/lib && ln -s ../lib32/libpthread_nonshared.a . + + # Add /lib32 and /usr/lib32 into ld.so.conf. + echo "/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf + echo "/usr/lib32" >> $XBPS_MASTERDIR/etc/ld.so.conf rm -rf $tmpdir wrksrc=$XBPS_BUILDDIR/libc