[Pkg-chromium-commit] [pkg-chromium] 01/01: release 37.0.2062.120-2

[Michael Gilbert]

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

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

commit 4a0bcedfa3045591c1456be90b347a9f2c92557d
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Mon Sep 22 09:17:14 2014 -0400

    release 37.0.2062.120-2
---
 debian/changelog           |  7 +++++++
 debian/control             |  2 ++
 debian/patches/clang.patch | 16 ++++++++++++++++
 debian/patches/series      |  1 +
 debian/rules               |  9 +++++++--
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f3e33a..c94d1ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chromium-browser (37.0.2062.120-2) unstable; urgency=medium
+
+  * Build with clang instead of gcc.
+  * Add libexif-dev build dependency.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 21 Sep 2014 22:57:11 +0000
+
 chromium-browser (37.0.2062.120-1) unstable; urgency=medium
 
   * New upstream stable release (closes: #761090):
diff --git a/debian/control b/debian/control
index 1f23e0a..41c8c1e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,12 +21,14 @@ Build-Depends:
  flex,
  gperf,
  wdiff,
+ clang,
  coreutils (>= 7.5) | timeout,
  xvfb,
  x11-apps,
  xfonts-base,
  fonts-ipafont-gothic,
  fonts-ipafont-mincho,
+ libexif-dev,
  libjpeg-dev,
  libpng-dev,
  libbz2-dev,
diff --git a/debian/patches/clang.patch b/debian/patches/clang.patch
new file mode 100644
index 0000000..9cdd25c
--- /dev/null
+++ b/debian/patches/clang.patch
@@ -0,0 +1,16 @@
+description: use system clang compilers
+author: Michael Gilbert <mgilbert at debian.org>
+
+--- a/build/common.gypi
++++ b/build/common.gypi
+@@ -5385,8 +5385,8 @@
+     ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) '
+         'and OS!="win"', {
+       'make_global_settings': [
+-        ['CC', '<(make_clang_dir)/bin/clang'],
+-        ['CXX', '<(make_clang_dir)/bin/clang++'],
++        ['CC', '/usr/bin/clang'],
++        ['CXX', '/usr/bin/clang++'],
+         ['CC.host', '$(CC)'],
+         ['CXX.host', '$(CXX)'],
+       ],
diff --git a/debian/patches/series b/debian/patches/series
index a0019cd..ac55c7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ no-sse2.patch
 make-support/gyp.patch
 make-support/opus.patch
 make-support/mojo.patch
+clang.patch
diff --git a/debian/rules b/debian/rules
index 4a345ec..121fcf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,9 @@ WANT_TESTS       ?= 0
 WANT_SANDBOXING  ?= 1
 USE_SYSTEM_V8    ?= 0
 
-# enable build hardening options (pie disabled due to ffmpeg linking issue)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+# enable build hardening options (pie disabled due to ffmpeg linking issue,
+# stackprotectorstrong disabled since its not supported by clang 3.4)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie,-stackprotectorstrong
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
@@ -56,6 +57,10 @@ GYP_DEFINES += google_api_key='AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k'
 GYP_DEFINES += google_default_client_id='811574891467.apps.googleusercontent.com'
 GYP_DEFINES += google_default_client_secret='kdloedMFGdGla2P1zacGjAQh'
 
+# Use clang instead of gcc.
+GYP_DEFINES += clang=1
+GYP_DEFINES += clang_use_chrome_plugins=0
+
 # Enable all codecs for HTML5 in chromium, depending on which ffmpeg sumo lib
 # is installed, the set of usable codecs (at runtime) will still vary
 GYP_DEFINES += proprietary_codecs=1

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