prepare_features_dirs: fix ccache/distcc libdir

This will fix bug #355283.

diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py
index 992d2bac65a5b61a544d7cbecd85a972d21b76fd..259bedf80ba8e4560b21cfcb42b70bc9ecd03f19 100644 (file)
--- 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"),