setup_myfeatures(){
setup_myemergeopts
+ export FEATURES="-news"
if [ -n "${clst_CCACHE}" ]
then
export clst_myfeatures="${clst_myfeatures} ccache"
sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
mkdir -p /etc/distcc
echo "${clst_distcc_hosts}" > /etc/distcc/hosts
- # We need to run distcc-config, since it might not have gotten run
- [ -x /usr/bin/distcc-config ] && /usr/bin/distcc-config --install
# This sets up automatic cross-distcc-fu according to
# http://www.gentoo.org/doc/en/cross-compiling-distcc.xml
CHOST=$(portageq envvar CHOST)
- # TODO: change to use get_libdir
- cd /usr/lib/distcc/bin
+ LIBDIR=$(get_libdir)
+ cd /usr/${LIBDIR}/distcc/bin
rm cc gcc g++ c++ 2>/dev/null
- echo -e '#!/bin/bash\nexec /usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
- chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
+ echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+ chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper
for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
fi
export PATH="/usr/lib/icecc/bin:${PATH}"
export PREROOTPATH="/usr/lib/icecc/bin"
fi
- export FEATURES="${clst_myfeatures}"
+ export FEATURES="${clst_myfeatures} -news"
}
setup_myemergeopts(){
clst_myemergeopts="--verbose"
else
clst_myemergeopts="--quiet"
+ bootstrap_opts="${bootstrap_opts} -q"
fi
if [ -n "${clst_FETCH}" ]
then
- export bootstrap_opts="-f"
+ export bootstrap_opts="${bootstrap_opts} -f"
export clst_myemergeopts="${clst_myemergeopts} -f"
elif [ -n "${clst_PKGCACHE}" ]
then
export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
- export bootstrap_opts="-r"
+ export bootstrap_opts="${bootstrap_opts} -r"
fi
}
# portage to avoid frying our /etc/make.conf file. Otherwise, we could
# just let emerge system could merge it.
[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
- run_merge --oneshot --nodeps virtual/portage
+ run_merge --oneshot --nodeps sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/make.conf
}
cleanup_distcc() {
+ LIBDIR=$(get_libdir)
rm -rf /etc/distcc/hosts
for i in cc gcc c++ g++; do
- # TODO: change to use get_libdir
- rm -f /usr/lib/distcc/bin/${i}
- ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
+ rm -f /usr/${LIBDIR}/distcc/bin/${i}
+ ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i}
done
- rm -f /usr/lib/distcc/bin/*-wrapper
+ rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper
}
cleanup_icecream() {