From 39ebd3cdea2f1d0e9252e9bb9765f64b5ae7e25a Mon Sep 17 00:00:00 2001
From: sbc <sbc@chromium.org>
Date: Mon, 4 May 2015 16:45:56 -0700
Subject: [PATCH] [NaCl SDK] Build sel_ldr and ncval against debian/stable
 sysroot

This allows sel_ldr to be deployed and run on debian/stable.
Currently we are building against the host system libraries
which are currently ubuntu/precise.  This results in binarys
that depend on more recent versions of glibc than are available
in debian/stable.

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk

Review URL: https://codereview.chromium.org/1061713005

Cr-Commit-Position: refs/heads/master@{#328219}
---
 build/common.gypi                              |  3 ++-
 native_client_sdk/src/build_tools/build_sdk.py | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/build/common.gypi b/build/common.gypi
index 158d972ae74a..8c690c34c9b0 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -173,6 +173,7 @@
 
         # The system root for cross-compiles. Default: none.
         'sysroot%': '',
+        'use_sysroot%': 0,
         'chroot_cmd%': '',
 
         # The system libdir used for this ABI.
@@ -941,7 +942,7 @@
           'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_arm-sysroot',
         }], # OS=="linux" and target_arch=="arm" and chromeos==0
 
-        ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chromeos==0', {
+        ['OS=="linux" and ((branding=="Chrome" and buildtype=="Official" and chromeos==0) or use_sysroot==1)' , {
           'conditions': [
             ['target_arch=="x64"', {
               'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_amd64-sysroot',
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index fc7fc3e36fbb..6f7495928214 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -553,6 +553,7 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
   gyp_env['GYP_GENERATORS'] = 'ninja'
   gyp_defines = gyp_defines or []
   gyp_defines.append('nacl_allow_thin_archives=0')
+  gyp_defines.append('use_sysroot=1')
   if options.mac_sdk:
     gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
 
@@ -1012,6 +1013,8 @@ def main(args):
   global options
   options = parser.parse_args(args)
 
+  buildbot_common.BuildStep('build_sdk')
+
   if options.nacl_tree_path:
     options.bionic = True
     toolchain_build = os.path.join(options.nacl_tree_path, 'toolchain_build')
@@ -1082,6 +1085,16 @@ def main(args):
     # of the build.
     del os.environ['NACL_SDK_ROOT']
 
+  if platform == 'linux':
+    # Linux-only: make sure the debian/stable sysroot image is installed
+    install_script = os.path.join(SRC_DIR, 'chrome', 'installer', 'linux',
+                                  'sysroot_scripts',
+                                  'install-debian.wheezy.sysroot.py')
+
+    buildbot_common.Run([sys.executable, install_script, '--arch=arm'])
+    buildbot_common.Run([sys.executable, install_script, '--arch=i386'])
+    buildbot_common.Run([sys.executable, install_script, '--arch=amd64'])
+
   if not options.skip_toolchain:
     BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
     BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
-- 
2.11.4.GIT