[packages/chromium-browser] setup linux_x86_newlib once

glen glen at pld-linux.org
Tue Jan 1 23:02:55 CET 2013


commit fded59be0d9aed59d0454e71faf073edef597ec6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 2 00:00:12 2013 +0200

    setup linux_x86_newlib once

 chromium-browser.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index d3c79a7..62ad8e2 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -296,11 +296,13 @@ EOF
 
 sh -x clean-source.sh %{!?with_system_v8:v8=0} %{!?with_nacl:nacl=0} libxml=0 %{!?with_system_zlib:zlib=0}
 
+rm -rf native_client/toolchain/linux_x86_newlib
+
 %build
 cd src
 
 %if %{with nacl}
-rm -rf native_client/toolchain/linux_x86_newlib
+if [ ! -d native_client/toolchain/linux_x86_newlib ]; then
 # Make symlinks for nacl
 cd native_client/toolchain
 install -d linux_x86_newlib/x86_64-nacl/bin
@@ -326,6 +328,7 @@ 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 ../../../../../..
+fi
 %endif
 
 test -e Makefile || %{__python} build/gyp_chromium \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/48ffbc5ed2a2348984435bf114daf604896a7621



More information about the pld-cvs-commit mailing list