From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QaX7d-0000dD-Az for garchives@archives.gentoo.org; Sat, 25 Jun 2011 17:58:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B11891C112; Sat, 25 Jun 2011 17:52:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A77C71C112 for ; Sat, 25 Jun 2011 17:52:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04ABF2AC059 for ; Sat, 25 Jun 2011 17:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 54B7A8003C for ; Sat, 25 Jun 2011 17:52:09 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <7d6fb00a9d36767fa1f88e81f3e02dbdbdd8d8b3.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst_2 commit in: /, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: ChangeLog targets/support/chroot-functions.sh X-VCS-Directories: / targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7d6fb00a9d36767fa1f88e81f3e02dbdbdd8d8b3 Date: Sat, 25 Jun 2011 17:52:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d2e1e687592f9bcd2754af99bf5b26dd commit: 7d6fb00a9d36767fa1f88e81f3e02dbdbdd8d8b3 Author: Matt Turner gentoo org> AuthorDate: Sat Jun 25 17:50:22 2011 +0000 Commit: Matt Turner gmail com> CommitDate: Sat Jun 25 17:51:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/catalyst.git;= a=3Dcommit;h=3D7d6fb00a Use get_libdir instead of hard-coding lib for distcc --- ChangeLog | 4 ++++ targets/support/chroot-functions.sh | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70681df..61dc5b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ # $Id$ =20 25 Jun 2011; Matt Turner + targets/support/chroot-functions.sh: + Use get_libdir instead of hard-coding lib for distcc + + 25 Jun 2011; Matt Turner modules/catalyst/arch/mips.py: add multilib (and missing n64) classes =20 25 Jun 2011; Matt Turner diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot= -functions.sh index 72fee20..caaa576 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=3D$(portageq envvar CHOST) - # TODO: change to use get_libdir - cd /usr/lib/distcc/bin + LIBDIR=3D$(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 =20 @@ -172,13 +172,13 @@ setup_pkgmgr(){ } =20 cleanup_distcc() { + LIBDIR=3D$(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 } =20 cleanup_icecream() {