fix(coreos-base/libchromeos): Fix building with sysroot-wrappers

Tell the scons build to pass the PATH environment variable through.
This commit is contained in:
Michael Marineau 2013-07-17 18:59:44 -04:00
parent 0ff9fe09d6
commit e8b1ef8bc2
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/SConstruct b/SConstruct
index 11219ed..41d12a6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -31,7 +31,7 @@ def common_env():
env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
# Fix issue with scons not passing some vars through the environment.
- for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
+ for key in Split('PATH PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'):
if os.environ.has_key(key):
env['ENV'][key] = os.environ[key]

View File

@ -8,7 +8,7 @@ CROS_WORKON_PROJECT="chromiumos/platform/libchromeos"
LIBCHROME_VERS=( 180609 ) LIBCHROME_VERS=( 180609 )
inherit toolchain-funcs cros-debug cros-workon scons-utils inherit eutils toolchain-funcs cros-debug cros-workon scons-utils
DESCRIPTION="Chrome OS base library." DESCRIPTION="Chrome OS base library."
HOMEPAGE="http://www.chromium.org/" HOMEPAGE="http://www.chromium.org/"
@ -40,6 +40,10 @@ cr_scons() {
BASE_VER=${v} escons -C ${v} -Y "${S}" "$@" BASE_VER=${v} escons -C ${v} -Y "${S}" "$@"
} }
src_prepare() {
epatch "${FILESDIR}/${P}-preserve-path.patch"
}
src_compile() { src_compile() {
tc-export CC CXX AR RANLIB LD NM PKG_CONFIG tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
cros-debug-add-NDEBUG cros-debug-add-NDEBUG