[Pkg-chromium-commit] [pkg-chromium] 02/04: arm64 buildsystem patches

[Riku Voipio]

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

riku pushed a commit to branch arm64
in repository pkg-chromium.

commit 71b4c2043bfe251d04990ebef0bf0aa2bc4470a8
Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Mon Dec 12 12:06:22 2016 +0200

    arm64 buildsystem patches
    
    Pull patches from upstream for building chromium on arm64 natively.
---
 debian/patches/arm64-gcc-toolchain.patch | 35 ++++++++++++++++++++++++++++++++
 debian/patches/arm64-gn.patch            | 26 ++++++++++++++++++++++++
 debian/patches/series                    |  4 ++++
 3 files changed, 65 insertions(+)

diff --git a/debian/patches/arm64-gcc-toolchain.patch b/debian/patches/arm64-gcc-toolchain.patch
new file mode 100644
index 0000000..e9c1ff2
--- /dev/null
+++ b/debian/patches/arm64-gcc-toolchain.patch
@@ -0,0 +1,35 @@
+From: riku.voipio <riku.voipio at linaro.org>
+Subject: Add gcc toolchain for arm64/linux
+ This is needed for Chromium builds in debian/arm64 and matches 
+ how arm, x86 and x86_64 also have both clang and gcc toolchains available.
+Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09791a1dcfd185141f71627c3b8d437db
+
+Index: chromium-browser-54.0.2840.101/build/toolchain/linux/BUILD.gn
+===================================================================
+--- chromium-browser-54.0.2840.101.orig/build/toolchain/linux/BUILD.gn
++++ chromium-browser-54.0.2840.101/build/toolchain/linux/BUILD.gn
+@@ -21,6 +21,24 @@ clang_toolchain("clang_arm64") {
+   }
+ }
+ 
++gcc_toolchain("arm64") {
++  toolprefix = "aarch64-linux-gnu-"
++
++  cc = "${toolprefix}gcc"
++  cxx = "${toolprefix}g++"
++
++  ar = "${toolprefix}ar"
++  ld = cxx
++  readelf = "${toolprefix}readelf"
++  nm = "${toolprefix}nm"
++
++  toolchain_args = {
++    current_cpu = "arm64"
++    current_os = "linux"
++    is_clang = false
++  }
++}
++
+ gcc_toolchain("arm") {
+   toolprefix = "arm-linux-gnueabihf-"
+ 
diff --git a/debian/patches/arm64-gn.patch b/debian/patches/arm64-gn.patch
new file mode 100644
index 0000000..a1637d6
--- /dev/null
+++ b/debian/patches/arm64-gn.patch
@@ -0,0 +1,26 @@
+From: riku.voipio <riku.voipio at linaro.org>
+Subject: GN: Add Arm64 Linux support
+ Add Arm64 linux support be able to build GN binary for native arm64 builds.
+Origin: upstream, https://chromium.googlesource.com/chromium/src.git/+/b9a43ab09791a1dcfd185141f71627c3b8d437db
+
+Index: chromium-browser-54.0.2840.101/tools/gn/args.cc
+===================================================================
+--- chromium-browser-54.0.2840.101.orig/tools/gn/args.cc
++++ chromium-browser-54.0.2840.101/tools/gn/args.cc
+@@ -268,6 +268,7 @@ void Args::SetSystemVarsLocked(Scope* de
+   static const char kX86[] = "x86";
+   static const char kX64[] = "x64";
+   static const char kArm[] = "arm";
++  static const char kArm64[] = "arm64";
+   static const char kMips[] = "mipsel";
+   const char* arch = nullptr;
+ 
+@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* de
+     arch = kX64;
+   else if (os_arch.substr(0, 3) == "arm")
+     arch = kArm;
++  else if (os_arch == "aarch64")
++    arch = kArm64;
+   else if (os_arch == "mips")
+     arch = kMips;
+   else
diff --git a/debian/patches/series b/debian/patches/series
index 948caa2..e7e5163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,7 @@ system/vpx.patch
 system/nspr.patch
 system/event.patch
 system/ffmpeg.patch
+
+arm64-gcc-toolchain.patch
+arm64-gn.patch
+

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