[Pkg-chromium-commit] [pkg-chromium] 01/06: always use system includes rather than ones of a chroot

[Shawn Landden]

This is an automated email from the git hooks/post-receive script.

shawnl-guest pushed a commit to branch master
in repository pkg-chromium.

commit 5fca336c488b4fa36d3383619eb48d67bfafc931
Author: Shawn Landden <shawnlandden at gmail.com>
Date:   Thu Aug 8 15:41:52 2013 -0700

    always use system includes rather than ones of a chroot
---
 .../patches/dont-assume-cross-compile-on-arm.patch |   37 ++++++++++++++++++++
 debian/patches/series                              |    2 ++
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/dont-assume-cross-compile-on-arm.patch b/debian/patches/dont-assume-cross-compile-on-arm.patch
new file mode 100644
index 0000000..f573b54
--- /dev/null
+++ b/debian/patches/dont-assume-cross-compile-on-arm.patch
@@ -0,0 +1,37 @@
+diff --git a/src/build/common.gypi b/src/build/common.gypi
+index 5312173..134f880 100644
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -635,31 +635,6 @@
+           'enable_settings_app%': 0,
+         }],
+ 
+-        ['OS=="linux" and target_arch=="arm" and chromeos==0', {
+-          # Set some defaults for arm/linux chrome builds
+-          'linux_breakpad%': 0,
+-          'linux_use_tcmalloc%': 0,
+-          # sysroot needs to be an absolute path otherwise it generates
+-          # incorrect results when passed to pkg-config
+-          'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
+-        }], # OS=="linux" and target_arch=="arm" and chromeos==0
+-
+-        ['linux_lsb_release=="12.04"', {
+-          'conditions': [
+-            ['target_arch=="x64"', {
+-              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_amd64-sysroot',
+-            }],
+-            ['target_arch=="ia32"', {
+-              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_i386-sysroot',
+-            }],
+-        ],
+-        }], # linux_lsb_release=="12.04"
+-
+-        ['target_arch=="mipsel"', {
+-          'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
+-          'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc',
+-        }],
+-
+         # Whether tests targets should be run, archived or just have the
+         # dependencies verified. All the tests targets have the '_run' suffix,
+         # e.g. base_unittests_run runs the target base_unittests. The test
+
diff --git a/debian/patches/series b/debian/patches/series
index a5df548..b598317 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,5 @@ webkit-version.patch
 arm.patch
 icon.patch
 arm-neon.patch
+dont-assume-cross-compile-on-arm.patch
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git