diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2011-06-25 13:50:22 -0400 |
|---|---|---|
| committer |   Matt Turner <mattst88@gmail.com> | 2011-06-25 13:50:22 -0400 |
| commit | 46f7d5ca4de8da33e2756078d48d0cd4e9364ce4 (patch) | |
| tree | 8ea0a2cf3149dc1195271e78e49527f849885461 | |
| parent | mips.py: add multilib (and missing n64) classes (diff) | |
| download | catalyst-46f7d5ca4de8da33e2756078d48d0cd4e9364ce4.tar.gz catalyst-46f7d5ca4de8da33e2756078d48d0cd4e9364ce4.tar.bz2 catalyst-46f7d5ca4de8da33e2756078d48d0cd4e9364ce4.zip | |
Use get_libdir instead of hard-coding lib for distcc
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | targets/support/chroot-functions.sh | 16 |
2 files changed, 12 insertions, 8 deletions
@@ -4,6 +4,10 @@ # $Id$ 25 Jun 2011; Matt Turner <mattst88@gentoo.org> + targets/support/chroot-functions.sh: + Use get_libdir instead of hard-coding lib for distcc + + 25 Jun 2011; Matt Turner <mattst88@gentoo.org> modules/catalyst/arch/mips.py: add multilib (and missing n64) classes 25 Jun 2011; Matt Turner <mattst88@gentoo.org> diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index ee605e5a..395a91c1 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -92,11 +92,11 @@ setup_myfeatures(){ # 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 @@ -172,13 +172,13 @@ setup_pkgmgr(){ } 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() { |