packages: octave/octave.spec - detect parallel make from %%{__make} macro
draenog
draenog at pld-linux.org
Fri Nov 6 23:23:03 CET 2009
Author: draenog Date: Fri Nov 6 22:23:03 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- detect parallel make from %%{__make} macro
---- Files affected:
packages/octave:
octave.spec (1.116 -> 1.117)
---- Diffs:
================================================================
Index: packages/octave/octave.spec
diff -u packages/octave/octave.spec:1.116 packages/octave/octave.spec:1.117
--- packages/octave/octave.spec:1.116 Fri Nov 6 20:43:09 2009
+++ packages/octave/octave.spec Fri Nov 6 23:22:58 2009
@@ -284,6 +284,11 @@
%patch4 -p1
%build
+RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g')"
+[ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
+RPM_BUILD_NR_THREADS=$(echo $RPM_BUILD_NR_THREADS)
+[ "$RPM_BUILD_NR_THREADS" -gt 4 ] && RPM_BUILD_NR_THREADS=4
+
cp -f /usr/share/automake/config.sub .
CFLAGS="%{rpmcflags} -I/usr/include/ncurses" ; export CFLAGS
CPPFLAGS="%{rpmcflags} -I/usr/include/ncurses -DH5_USE_16_API" ; export CPPFLAGS
@@ -296,7 +301,7 @@
--enable-rpath \
--enable-lite-kernel
-%{__make} -j 4
+%{__make} -j $RPM_BUILD_NR_THREADS
%install
rm -rf $RPM_BUILD_ROOT
@@ -386,6 +391,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.117 2009/11/06 22:22:58 draenog
+- detect parallel make from %%{__make} macro
+
Revision 1.116 2009/11/06 19:43:09 draenog
- missing BRs
- remove superfluous make runs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/octave/octave.spec?r1=1.116&r2=1.117&f=u
More information about the pld-cvs-commit
mailing list