commit: 67239a3f48989794ffe484206bc6afc40156d9db Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Mon Jun 6 15:48:01 2016 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Jun 6 15:49:57 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=67239a3f
Account for EPREFIX in ccache and distcc dirs (bug 582802) X-Gentoo-Bug: 582802 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=582802 pym/portage/package/ebuild/prepare_build_dirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py index ce54fdf..7fdac74 100644 --- a/pym/portage/package/ebuild/prepare_build_dirs.py +++ b/pym/portage/package/ebuild/prepare_build_dirs.py @@ -19,6 +19,7 @@ from portage.localization import _ from portage.output import colorize from portage.util import apply_recursive_permissions, \ apply_secpass_permissions, ensure_dirs, normalize_path, writemsg +from portage.const import EPREFIX def prepare_build_dirs(myroot=None, settings=None, cleanup=False): """ @@ -153,12 +154,12 @@ def _prepare_features_dirs(mysettings): features_dirs = { "ccache":{ - "path_dir": "/usr/%s/ccache/bin" % (libdir,), + "path_dir": "%s/usr/%s/ccache/bin" % (EPREFIX, libdir), "basedir_var":"CCACHE_DIR", "default_dir":os.path.join(mysettings["PORTAGE_TMPDIR"], "ccache"), "always_recurse":False}, "distcc":{ - "path_dir": "/usr/%s/distcc/bin" % (libdir,), + "path_dir": "%s/usr/%s/distcc/bin" % (EPREFIX, libdir), "basedir_var":"DISTCC_DIR", "default_dir":os.path.join(mysettings["BUILD_PREFIX"], ".distcc"), "subdirs":("lock", "state"),
