moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

chroot-glibc: repair bootstrap build.

Browse source
This commit is contained in:
Juan RP 2013-10-18 10:21:27 +02:00
parent 9cf47d53f6
commit b594820048
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
srcpkgs/chroot-glibc/template
View file

@ -13,10 +13,15 @@ checksum=2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
bootstrap=yes bootstrap=yes
if [ "$IN_CHROOT" ]; then if [ "$CHROOT_READY" ]; then
hostmakedepends="bison perl" hostmakedepends="bison perl"
fi fi
pre_configure() {
# Detect GNU Make 4.x.
sed -e 's,3.\[89\]\*,& \| \[4-9\]*,g' -i configure
}
do_configure() { do_configure() {
[ ! -d build ] && mkdir build [ ! -d build ] && mkdir build
cd build cd build
@ -66,13 +71,14 @@ do_install() {
# ldd is a bash script, so make it run as such. # ldd is a bash script, so make it run as such.
. $XBPS_HELPERSDIR/replace-interpreter.sh . $XBPS_HELPERSDIR/replace-interpreter.sh
replace_interpreter bash ${DESTDIR}/usr/bin/ldd replace_interpreter bash ${DESTDIR}/usr/bin/ldd
chmod 755 ${DESTDIR}/usr/bin/ldd
# On x86_64, add dynamic linker's 32bit version to ldd. # On x86_64, add dynamic linker's 32bit version to ldd.
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2" rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" ${DESTDIR}/usr/bin/ldd sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" ${DESTDIR}/usr/bin/ldd
chmod 755 ${DESTDIR}/usr/bin/ldd
fi fi
chmod 755 ${DESTDIR}/usr/bin/ldd
vmkdir etc/ld.so.conf.d vmkdir etc/ld.so.conf.d
echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf