From b45ff20de5b86c88bcc6b2d073e0970809e97f30 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Thu, 26 Mar 2009 21:23:09 +0000 Subject: [PATCH] We can no longer rely on the environment, since PATH initialisation is only done after parsing EAPI, hence we need to use absolute paths for our binaries too. Pick binaries from the Build EPREFIX, not the perhaps cross EPREFIX, except for PRELINK_BINARY, as I think that one should operate on the target, not the host, the others are host helper tools svn path=/main/branches/prefix/; revision=13199 --- pym/portage/const.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/const.py b/pym/portage/const.py index e6a6a0fd8..01f67d92d 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -57,11 +57,11 @@ LOCALE_DATA_PATH = PORTAGE_BASE_PATH+"/locale" EBUILD_SH_BINARY = PORTAGE_BIN_PATH+"/ebuild.sh" MISC_SH_BINARY = PORTAGE_BIN_PATH+"/misc-functions.sh" -SANDBOX_BINARY = EPREFIX+"/usr/bin/sandbox" -FAKEROOT_BINARY = EPREFIX+"/usr/bin/fakeroot" -BASH_BINARY = "bash" -MOVE_BINARY = "mv" -PRELINK_BINARY = "prelink" +SANDBOX_BINARY = BPREFIX+"/usr/bin/sandbox" +FAKEROOT_BINARY = BPREFIX+"/usr/bin/fakeroot" +BASH_BINARY = BPREFIX+"/bin/bash" +MOVE_BINARY = BPREFIX+"/bin/mv" +PRELINK_BINARY = EPREFIX+"/usr/sbin/prelink" WORLD_FILE = PRIVATE_PATH + "/world" MAKE_CONF_FILE = "/etc/make.conf" -- 2.26.2