[packages/chromium-browser/DEVEL: 3/5] nacl seems to build now

glen glen at pld-linux.org
Thu Nov 8 10:22:01 CET 2012


commit 6c8531c65a63af8b0bd9d85b123c3810392390e2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Nov 5 21:49:32 2012 +0200

    nacl seems to build now

 chromium-browser.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 9b5edce..31e123a 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -7,8 +7,7 @@
 %bcond_without	cups			# with cups
 %bcond_without	gconf			# with GConf
 %bcond_without	pulseaudio		# with pulseaudio
-# disable nacl, see http://forums.gentoo.org/viewtopic-t-937222-highlight-chromium.html
-%bcond_with	nacl			# build Native Client support
+%bcond_without	nacl			# build Native Client support
 %bcond_without	sandboxing		# with sandboxing
 %bcond_with		selinux			# with SELinux (need policy first)
 %bcond_with		shared_libs		# with shared libs
@@ -295,6 +294,12 @@ for i in $(find %{_prefix}/x86_64-nacl/include -type f | grep -v "c++"); do
 	ln -s $i ${i#%{_prefix}/x86_64-nacl/include/}
 done
 cd ../../../../../..
+
+: Preparing NaCl newlib toolchain
+mkdir sdk
+cp -a native_client/toolchain/linux_x86_newlib sdk/nacl-sdk
+install -d native_client/toolchain/.tars
+tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk
 %endif
 
 test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
@@ -324,6 +329,7 @@ test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
 %else
 	-Ddisable_nacl=1 \
 %endif
+	-Ddisable_pnacl=1 \
 	%{!?with_sse2:-Ddisable_sse2=1} \
 	%{?with_selinux:-Dselinux=1} \
 	%{gyp_with cups} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/7e136323c365d8e651e14ec04cb8ae609a01690e



More information about the pld-cvs-commit mailing list