[Pkg-chromium-commit] [pkg-chromium] 01/01: bring in arm fix patch from Ubuntu

[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 941ea2f51ebaedb8b0d6071b88d56e79c42731a7
Author: Shawn Landden <shawnlandden at gmail.com>
Date:   Thu Aug 8 15:22:56 2013 -0700

    bring in arm fix patch from Ubuntu
---
 .../patches/dont-assume-cross-compile-on-arm.patch |   20 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 21 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..d41477e
--- /dev/null
+++ b/debian/patches/dont-assume-cross-compile-on-arm.patch
@@ -0,0 +1,20 @@
+--- a/src/build/common.gypi
++++ b/src/build/common.gypi
+@@ -609,17 +609,6 @@
+           'enable_settings_app%': 0,
+         }],
+ 
+-        ['OS=="linux" and target_arch=="arm" and chromeos==0', {
+-          # Set some defaults for arm/linux chrome builds
+-          'armv7%': 1,
+-          'linux_breakpad%': 0,
+-          'linux_use_tcmalloc%': 0,
+-          'linux_use_gold_flags%': 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
+-
+         ['target_arch=="mipsel"', {
+           'sysroot': '<!(cd <(DEPTH) && pwd -P)/native_client/toolchain/linux_mips-trusted/sysroot',
+         }],
diff --git a/debian/patches/series b/debian/patches/series
index a5df548..7e82082 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ 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