From e8b1ef8bc29e1d773dc03766a8f2d4600e12269d Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 17 Jul 2013 18:59:44 -0400
Subject: [PATCH] fix(coreos-base/libchromeos): Fix building with
 sysroot-wrappers

Tell the scons build to pass the PATH environment variable through.
---
 .../files/libchromeos-0.0.1-preserve-path.patch     | 13 +++++++++++++
 .../libchromeos/libchromeos-0.0.1-r160.ebuild       |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch
new file mode 100644
index 0000000000..29b9c6208f
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/files/libchromeos-0.0.1-preserve-path.patch
@@ -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]
+ 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild
index 4163d5856d..f04ec68359 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchromeos/libchromeos-0.0.1-r160.ebuild
@@ -8,7 +8,7 @@ CROS_WORKON_PROJECT="chromiumos/platform/libchromeos"
 
 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."
 HOMEPAGE="http://www.chromium.org/"
@@ -40,6 +40,10 @@ cr_scons() {
 	BASE_VER=${v} escons -C ${v} -Y "${S}" "$@"
 }
 
+src_prepare() {
+    epatch "${FILESDIR}/${P}-preserve-path.patch"
+}
+
 src_compile() {
 	tc-export CC CXX AR RANLIB LD NM PKG_CONFIG
 	cros-debug-add-NDEBUG