aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-25 05:42:13 (GMT)
committerZac Medico <zmedico@gentoo.org>2011-06-25 05:42:13 (GMT)
commite543f089e917e2d4029d3338238df4013d46c66a (patch)
tree8ea70047ce442913f47ec0850ed1e3eb6164bf7c
parentAdd a QA check for systemd unit file install. (diff)
downloadportage-e543f089e917e2d4029d3338238df4013d46c66a.zip
portage-e543f089e917e2d4029d3338238df4013d46c66a.tar.gz
portage-e543f089e917e2d4029d3338238df4013d46c66a.tar.bz2
prepare_features_dirs: fix ccache/distcc libdir
This will fix bug #355283.
-rw-r--r--pym/portage/package/ebuild/prepare_build_dirs.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/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):
def _prepare_features_dirs(mysettings):
+ # Use default ABI libdir in accordance with bug #355283.
+ libdir = None
+ default_abi = mysettings.get("DEFAULT_ABI")
+ if default_abi:
+ libdir = mysettings.get("LIBDIR_" + default_abi)
+ if not libdir:
+ libdir = "lib"
+
features_dirs = {
"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"),