kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only run ldconfig -aout commands on i386

Browse source 
Correct some build environment variables
Exit with code 255 if the port build failed uncleanly
This commit is contained in:
Kris Kennaway 2002-06-06 20:55:57 +00:00
parent 42ccfa9b07
commit 79fb8478c2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=60722
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Tools/portbuild/scripts/portbuild
View file

@ -25,7 +25,9 @@ cleanup()
fi
done
chroot ${chroot} /sbin/ldconfig -R
chroot ${chroot} /sbin/ldconfig -aout -R #XXX i386 only
if [ ${arch} = "i386" ]; then
chroot ${chroot} /sbin/ldconfig -aout -R
fi
rm -rf ${chroot}/var/db/pkg/*
rm ${chroot}/used/${pkgname}
rmdir ${chroot}/used
@ -81,8 +83,9 @@ shift 2
buildenv ${pb} ${branch}
export WRKDIRPREFIX=${buildroot}
export WRKDIRPREFIX=/tmp
export DISTDIR=/tmp/distfiles
export PACKAGES=/tmp/packages
# to catch missing dependencies
#export DEPENDS_TARGET=/usr/bin/true
@ -199,9 +202,12 @@ fi
chroot ${chroot} /sbin/ldconfig -m /usr/lib/compat
chroot ${chroot} /sbin/ldconfig -R
chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/aout
chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/compat/aout
chroot ${chroot} /sbin/ldconfig -aout -R
if [ ${arch} = "i386" ]; then
chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/aout
chroot ${chroot} /sbin/ldconfig -aout -m /usr/lib/compat/aout
chroot ${chroot} /sbin/ldconfig -aout -R
fi
while [ $# -gt 0 ]; do
if [ -f ${packages}/All/$1 ]; then
@ -219,7 +225,11 @@ cp -p ${pb}/scripts/buildscript ${pb}/scripts/pnohang ${chroot}
# phase 1, make checksum
chroot ${chroot} /buildscript ${dirname} 1 2>&1 | tee -a ${chroot}/tmp/${pkgname}.log
error=$(cat ${chroot}/tmp/status)
if [ -f ${chroot}/tmp/status ]; then
error=$(cat ${chroot}/tmp/status)
else
error=255
fi
if [ "${error}" = 0 ]; then
# make checksum succeeded