[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/18.0.1025.168_r134367-1-13-g6144fa3

[Giuseppe Iuculano]

The following commit has been merged in the experimental branch:
commit 7e7de0c12975f278a09c7dceae203ff7c8de9d59
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Tue May 29 09:28:39 2012 +0200

    Disable tcmalloc, use internal copy of ffmpeg and libv8

diff --git a/debian/rules b/debian/rules
index da5892a..6b2b2d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEBIAN_DIST		:= $(shell lsb_release -ds | tr -d '()')
 DEBIAN_DIST_NAME	:= $(shell lsb_release -si)
 DEBIAN_DIST_VERSION	:= $(shell cat /etc/debian_version)
 MULTIARCH		:= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-USE_SYSTEM_FFMPEG	:= 1
+USE_SYSTEM_FFMPEG	:= 0
 ifeq (1,$(USE_SYSTEM_FFMPEG))
 LIBAVCODEC_BASENAME	:= $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavcodec.so.* | cut -d ' ' -f 1))
 LIBAVFORMAT_BASENAME	:= $(shell basename $$(ls -x /usr/lib/$(MULTIARCH)/libavformat.so.* | cut -d ' ' -f 1))
@@ -33,7 +33,7 @@ WANT_SYSTEM_LIBS ?= 1
 WANT_SHARED_LIBS ?= 0
 WANT_TESTS       ?= 0
 WANT_SANDBOXING  ?= 1
-USE_SYSTEM_V8    ?= 1
+USE_SYSTEM_V8    ?= 0
 VERBOSE          ?= 0
 
 export DEB_BUILD_HARDENING=1
@@ -72,6 +72,9 @@ ifeq (,$(filter unstable development,$(DEBIAN_DIST)))
 GYP_DEFINES += werror=$(NULL)
 endif
 
+#disable tcmalloc
+GYP_DEFINES += linux_use_tcmalloc=0
+
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 

-- 
Git repository for pkg-chromium