[packages/chromium-browser] use out-of-tree output dir

glen glen at pld-linux.org
Mon Dec 31 10:51:20 CET 2012


commit 673aee14ff85d8076d5780fc7aa949b459ffec57
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Dec 31 11:49:57 2012 +0200

    use out-of-tree output dir
    
    at least compiled output objects are stored there, not gyp outputs

 chromium-browser.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index fe2c35c..d9caafb 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -328,7 +328,10 @@ done
 cd ../../../../../..
 %endif
 
-test -e Makefile || %{__python} build/gyp_chromium --format=make build/all.gyp \
+test -e Makefile || %{__python} build/gyp_chromium \
+	--format=make \
+	-Goutput_dir=../out \
+	build/all.gyp \
 %ifarch %{ix86}
 	-Dtarget_arch=ia32 \
 %endif
@@ -403,7 +406,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{themes,plugins,extensions} \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/%{name},%{_mandir}/man1,%{_desktopdir}}
 
-cd src/out/%{!?debug:Release}%{?debug:Debug}
+cd out/%{!?debug:Release}%{?debug:Debug}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{__sed} -i -e 's, at libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/3a0be9f81ff1da1369569a1dfaefb0f723684980



More information about the pld-cvs-commit mailing list