r896 ./packages/openofficeorg/2.3/experimental: migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS
------------------------------------------------------------
revno: 896
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2007-09-25 11:37:40 +0200
message:
migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-09-24 14:11:04 +0000
+++ b/changelog 2007-09-25 09:37:40 +0000
@@ -4,6 +4,9 @@
* debian/rules:
- remove bogus curl conditional which was temporary but slipped in...
- fix Developer Snapshot detection to match on x.y.z~mX
+ - migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS, the latter
+ is the quasi standard and will also be used by -j of the new
+ dpkg-buildpackage
[ Mirco Bauer ]
* debian/rules:
@@ -13,7 +16,7 @@
* debian/control.mono.in:
- enhanced package description
- -- Rene Engelhard <rene@debian.org> Mon, 24 Sep 2007 16:09:40 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 25 Sep 2007 11:36:00 +0200
openoffice.org (1:2.3.0-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2007-09-24 14:11:04 +0000
+++ b/rules 2007-09-25 09:37:40 +0000
@@ -670,9 +670,9 @@
BUILD_FROM=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?from=\([a-zA-Z0-9]\+\).*$$/\2/p')
export BUILD_FROM
-# Build n projects in paralell?
-# DEB_BUILD_OPTIONS=num-cpus=<n>
-NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?num-cpus=\([0-9]\+\).*$$/\2/p')
+# Build n projects in parallel?
+# DEB_BUILD_OPTIONS=parallel=<n>
+NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?parallel=\([0-9]\+\).*$$/\2/p')
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
ifeq "$(PARALLEL_BUILD)" "y"
Reply to: