enable tcmalloc

diff --git a/chromium-browser.spec b/chromium-browser.spec
index eee5ebeb9a878c766638b5ff9e4a2077956f1f90..eefd8e04f237d5185893d4d6c1591cd5a1676f20 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -31,7 +31,7 @@
 %bcond_without system_libvpx   # system libvpx
 %bcond_without system_yasm             # system yasm
 %bcond_without system_zlib             # system zlib
-%bcond_with            tcmalloc                # use tcmalloc
+%bcond_without tcmalloc                # use tcmalloc
 %bcond_without verbose                 # verbose build (V=1)
 
 %if %{with nacl}
@@ -70,7 +70,7 @@
 Summary:       A WebKit powered web browser
 Name:          chromium-browser
 Version:       24.0.1312.45
-Release:       0.23
+Release:       0.24
 License:       BSD, LGPL v2+ (ffmpeg)
 Group:         X11/Applications/Networking
 Source0:       http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.gz
@@ -104,6 +104,7 @@ Patch23:    no-pnacl.patch
 Patch24:       nacl-verbose.patch
 Patch25:       gnome3-volume-control.patch
 Patch26:       master-prefs-path.patch
+Patch27:       tcmalloc-glibc2.16.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -262,6 +263,7 @@ cd src
 %patch19 -p1
 %patch22 -p1
 %patch25 -p1
+%patch27 -p1
 cd ..
 %patch18 -p1
 %patch23 -p1

diff --git a/tcmalloc-glibc2.16.patch b/tcmalloc-glibc2.16.patch
new file mode 100644 (file)
index 0000000..e6c7f02
--- /dev/null
+++ b/tcmalloc-glibc2.16.patch
@@ -0,0 +1,12 @@
+diff -up chromium-21.0.1180.81/third_party/tcmalloc/chromium/src/base/linuxthreads.cc.glibc216 chromium-21.0.1180.81/third_party/tcmalloc/chromium/src/base/linuxthreads.cc
+--- chromium-21.0.1180.81/third_party/tcmalloc/chromium/src/base/linuxthreads.cc.glibc216      2012-08-30 20:34:00.324468082 -0400
++++ chromium-21.0.1180.81/third_party/tcmalloc/chromium/src/base/linuxthreads.cc       2012-08-30 20:34:15.458468310 -0400
+@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
+ /* Signal handler to help us recover from dying while we are attached to
+  * other threads.
+  */
+-static void SignalHandler(int signum, siginfo_t *si, void *data) {
++static void SignalHandler(int signum, siginfo *si, void *data) {
+   if (sig_pids != NULL) {
+     if (signum == SIGABRT) {
+       while (sig_num_threads-- > 0) {