snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Do not override PATH in chroot and always make lib64 -> lib symlinks on 

x86_64.

--HG--
extra : convert_revision : 48d28cff104a1cc8d8a57cef299b08bdc4edb272
This commit is contained in:
Juan RP 2008-11-17 09:17:02 +01:00
parent 19b8381b64
commit a37c42c94d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xbps.sh
View File

@ -213,6 +213,16 @@ check_config_vars()
[ $? -ne 0 ] && msg_error "couldn't create '$f' directory" [ $? -ne 0 ] && msg_error "couldn't create '$f' directory"
fi fi
done done
if [ "$xbps_machine" = "x86_64" ]; then
[ ! -d $XBPS_MASTERDIR/lib ] && mkdir -p $XBPS_MASTERDIR/lib
[ ! -h $XBPS_MASTERDIR/lib64 ] && \
cd $XBPS_MASTERDIR && ln -s lib lib64
[ ! -d $XBPS_MASTERDIR/usr/lib ] && \
mkdir -p $XBPS_MASTERDIR/usr/lib
[ ! -h $XBPS_MASTERDIR/usr/lib64 ] && \
cd $XBPS_MASTERDIR/usr && ln -s lib lib64
fi
} }
# #
@ -306,8 +316,8 @@ prepare_tmpl()
if [ -z "$in_chroot" ]; then if [ -z "$in_chroot" ]; then
export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin" export PATH="$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/sbin"
export PATH="$PATH:$XBPS_MASTERDIR/usr/bin:$XBPS_MASTERDIR/usr/sbin" export PATH="$PATH:$XBPS_MASTERDIR/usr/bin:$XBPS_MASTERDIR/usr/sbin"
export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin"
fi fi
export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin"
} }
# #