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 1QaLe4-0002QX-Af for garchives@archives.gentoo.org; Sat, 25 Jun 2011 05:43:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 436251C106; Sat, 25 Jun 2011 05:42:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F00F01C106 for ; Sat, 25 Jun 2011 05:42:47 +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 5DC721B4027 for ; Sat, 25 Jun 2011 05:42:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 62C758003C for ; Sat, 25 Jun 2011 05:42:46 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/prepare_build_dirs.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e543f089e917e2d4029d3338238df4013d46c66a Date: Sat, 25 Jun 2011 05:42:46 +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: d8b9f83ed68862f7d8d20aa211cec4d7 commit: e543f089e917e2d4029d3338238df4013d46c66a Author: Zac Medico gentoo org> AuthorDate: Sat Jun 25 05:42:13 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 25 05:42:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3De543f089 prepare_features_dirs: fix ccache/distcc libdir This will fix bug #355283. --- pym/portage/package/ebuild/prepare_build_dirs.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/porta= ge/package/ebuild/prepare_build_dirs.py index 992d2ba..259bedf 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -142,14 +142,22 @@ def _adjust_perms_msg(settings, msg): =20 def _prepare_features_dirs(mysettings): =20 + # Use default ABI libdir in accordance with bug #355283. + libdir =3D None + default_abi =3D mysettings.get("DEFAULT_ABI") + if default_abi: + libdir =3D mysettings.get("LIBDIR_" + default_abi) + if not libdir: + libdir =3D "lib" + features_dirs =3D { "ccache":{ - "path_dir": "/usr/lib/ccache/bin", + "path_dir": "/usr/%s/ccache/bin" % (libdir,), "basedir_var":"CCACHE_DIR", "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"), "always_recurse":False}, "distcc":{ - "path_dir": "/usr/lib/distcc/bin", + "path_dir": "/usr/%s/distcc/bin" % (libdir,), "basedir_var":"DISTCC_DIR", "default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"), "subdirs":("lock", "state"),