Author: glen Date: Mon Nov 14 11:16:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- use system v8
---- Files affected:
packages/chromium-browser:
chromium-browser.spec (1.148 -> 1.149)
---- Diffs:
================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.148
packages/chromium-browser/chromium-browser.spec:1.149
--- packages/chromium-browser/chromium-browser.spec:1.148 Mon Nov 14
11:13:33 2011
+++ packages/chromium-browser/chromium-browser.spec Mon Nov 14 12:16:31 2011
@@ -54,7 +54,7 @@
%define svndate %{nil}
%define svnver 109393
-%define rel 1
+%define rel 2
%define gyp_rev 1014
Summary: A WebKit powered web browser
@@ -122,7 +122,7 @@
BuildRequires: sqlite3-devel >= 3.6.1
BuildRequires: tar >= 1:1.22
BuildRequires: util-linux
-%{?with_system_v8:BuildRequires: v8-devel}
+%{?with_system_v8:BuildRequires: v8-devel >= 3.6}
BuildRequires: which
BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXt-devel
@@ -238,6 +238,17 @@
# third_party/yasm/source/patched-yasm/modules/arch/x86/gen_x86_insn.py',
needed by `out/Release/obj/gen/third_party/yasm/x86insns.c'. Stop.
#remove_bundled_lib "third_party/yasm"
+%if %{with system_v8}
+# Remove bundled v8.
+find v8 -type f \! -iname '*.gyp*' -delete
+
+# The implementation files include v8 headers with full path,
+# like #include "v8/include/v8.h". Make sure the system headers
+# will be used.
+rmdir v8/include
+ln -s %{_includedir} v8/include
+%endif
+
%build
cd src
%{__python} build/gyp_chromium --format=make build/all.gyp \
@@ -257,7 +268,6 @@
%{!?debug:-Dwerror=} \
%{!?debuginfo:-Dfastbuild=1} \
%{?with_shared_libs:-Dlibrary=shared_library} \
- -Djavascript_engine=%{?with_system_v8:system-v8}%{!?with_system_v8:v8} \
-Dbuild_ffmpegsumo=%{?with_ffmpegsumo:1}%{!?with_ffmpegsumo:0} \
-Dffmpeg_branding=Chrome \
-Dproprietary_codecs=1 \
@@ -372,6 +382,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.149 2011/11/14 11:16:31 glen
+- use system v8
+
Revision 1.148 2011/11/14 10:13:33 glen
- add gyp_with bacro for bcond mapping to gyp parameters
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.148&r2=1.149&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
