Author: megabajt Date: Sun Feb 7 11:55:56 2010 GMT Module: packages Tag: HEAD ---- Log message: - added parallelbuild bcond, disabled by default. Parallel build fails on th builders.
---- Files affected: packages/openoffice.org: openoffice.org.spec (1.854 -> 1.855) ---- Diffs: ================================================================ Index: packages/openoffice.org/openoffice.org.spec diff -u packages/openoffice.org/openoffice.org.spec:1.854 packages/openoffice.org/openoffice.org.spec:1.855 --- packages/openoffice.org/openoffice.org.spec:1.854 Sun Feb 7 11:35:29 2010 +++ packages/openoffice.org/openoffice.org.spec Sun Feb 7 12:55:51 2010 @@ -44,6 +44,7 @@ %bcond_with ccache # use ccache to speed up builds %bcond_with icecream # use icecream to speed up builds %bcond_with msaccess # with ms access import pieces +%bcond_with parallelbuild # use greater number of jobs to speed up build (default: 1) %bcond_without system_beanshell %bcond_without system_db # without system (i.e. with internal) Berkeley DB @@ -2466,9 +2467,13 @@ export DEFAULT_TO_ENGLISH_FOR_PACKING=1 +%if %{with parallelbuild} 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) +%else +RPM_BUILD_NR_THREADS="1" +%endif if [ -f %{_javadir}/serializer.jar ];then serializer_jar=%{_javadir}/serializer.jar @@ -4617,6 +4622,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.855 2010/02/07 11:55:51 megabajt +- added parallelbuild bcond, disabled by default. Parallel build fails on th builders. + Revision 1.854 2010/02/07 10:35:29 megabajt - updated to 3.2.0.5 - removed -hotfix-kde4.patch (fixed upstream) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.854&r2=1.855&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit