------------------------------------------------------------
revno: 2352 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Thu 2011-01-27 20:13:26 +0100
message:
fix parallel=n handling, thanks Kees Cook
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2011-01-26 01:59:25 +0000
+++ b/changelog 2011-01-26 02:20:19 +0000
@@ -1,3 +1,11 @@
+libreoffice (1:3.3.0-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix parallel=n handling to also work if parallel=N is not the first or
+ only option, thanks Kees Cook
+
+ -- Rene Engelhard <[email protected]> Tue, 25 Jan 2011 12:42:33 +0100
+
libreoffice (1:3.3.0-1) experimental; urgency=low
* LibreOffice 3.3.0 final (identical to rc4)
=== modified file 'rules'
--- a/rules 2011-01-24 10:18:36 +0000
+++ b/rules 2011-01-26 02:20:19 +0000
@@ -1162,7 +1162,7 @@
## Build n projects in parallel?
## DEB_BUILD_OPTIONS=parallel=<n>
-NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^\(.*\s\)\?parallel=\([0-9]\+\).*/\2/p')
+NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^\(.*
\)\?parallel=\([0-9]\+\).*$$/\2/p')
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
