packages: chromium-browser/chromium-browser.spec - nacl builds now, but cra...

[glen]

Author: glen                         Date: Tue Nov 15 12:55:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- nacl builds now, but crashes for me, so not enabled

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.153 packages/chromium-browser/chromium-browser.spec:1.154
--- packages/chromium-browser/chromium-browser.spec:1.153	Mon Nov 14 16:30:14 2011
+++ packages/chromium-browser/chromium-browser.spec	Tue Nov 15 13:55:09 2011
@@ -32,11 +32,6 @@
 # - use_system_stlport
 # - other defaults: src/build/common.gypi
 
-# build broken on x86-64 due 32bit exe:
-# /home/users/glen/rpm/BUILD.x86_64-linux/chromium-browser-15.0.863.0~svn20110826r98379/src/native_client/toolchain/linux_x86_newlib/bin/x86_64-nacl-ar: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.15, stripped
-# build broken on x86-32:
-# /home/users/glen/rpm/BUILD.i686-linux/chromium-browser-15.0.863.0~svn20110826r98379/src/native_client/toolchain/linux_x86_newlib/bin/../lib/gcc/x86_64-nacl/acl/bin/ld: crtbegin.o: No such file: No such file or directory
-
 # NOTES:
 # - mute BEEP mixer if you do not want to hear horrible system bell when
 #   pressing home/end in url bar or more ^F search results on page.
@@ -54,7 +49,7 @@
 
 %define		svndate	%{nil}
 %define		svnver	109393
-%define		rel		2
+%define		rel		3
 
 %define		gyp_rev	1014
 Summary:	A WebKit powered web browser
@@ -107,6 +102,7 @@
 BuildRequires:	libxslt-devel
 BuildRequires:	lzma
 BuildRequires:	minizip-devel
+%{?with_nacl:BuildRequires:	nacl-toolchain-newlib >= 0.6941}
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel >= 1:3.12.3
 BuildRequires:	pam-devel
@@ -250,9 +246,15 @@
 ln -s %{_includedir} v8/include
 %endif
 
+%if %{with nacl}
+# NOTE: here is always x86_64
+rm -rf native_client/toolchain/linux_x86_newlib
+ln -s %{_prefix}/x86_64-nacl-newlib native_client/toolchain/linux_x86_newlib
+%endif
+
 %build
 cd src
-%{__python} build/gyp_chromium --format=make build/all.gyp \
+test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
 %ifarch %{ix86}
 	-Dtarget_arch=ia32 \
 %endif
@@ -322,6 +324,19 @@
 install -p libffmpegsumo.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 %endif
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+
+%if %{with nacl}
+# Install Native Client files on platforms that support it.
+install -p nacl_helper{,_bootstrap} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p libppGoogleNaClPluginChrome.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+%ifarch %{x8664}
+install -p nacl_irt_x86_64.nexe $RPM_BUILD_ROOT%{_libdir}/%{name}
+%endif
+%ifarch %{ix86}
+install -p nacl_irt_x86_32.nexe $RPM_BUILD_ROOT%{_libdir}/%{name}
+%endif
+%endif
+
 cd -
 
 cp -p src/chrome/app/theme/chromium/product_logo_48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
@@ -375,6 +390,13 @@
 %attr(755,root,root) %{_libdir}/%{name}/libffmpegsumo.so
 %endif
 
+%if %{with nacl}
+%attr(755,root,root) %{_libdir}/%{name}/libppGoogleNaClPluginChrome.so
+%attr(755,root,root) %{_libdir}/%{name}/nacl_helper
+%attr(755,root,root) %{_libdir}/%{name}/nacl_helper_bootstrap
+%attr(755,root,root) %{_libdir}/%{name}/nacl_irt_x86_*.nexe
+%endif
+
 %files l10n -f %{name}.lang
 %defattr(644,root,root,755)
 
@@ -384,6 +406,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2011/11/15 12:55:09  glen
+- nacl builds now, but crashes for me, so not enabled
+
 Revision 1.153  2011/11/14 15:30:14  glen
 - add system_libwebp bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.153&r2=1.154&f=u