r801 ./packages/openofficeorg/2.2.1/unstable: migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS (merge from 2.3)
------------------------------------------------------------
revno: 801
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2007-10-19 19:04:56 +0200
message:
migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS (merge from 2.3)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 17:01:40 +0000
+++ b/changelog 2007-10-19 17:04:56 +0000
@@ -6,6 +6,9 @@
bad free on theme resources (closes: #444741
* merge from 2.3 branch:
- debian/rules:
+ + 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
+ build-depend on lib32icu36 on amd64 when using ICU 3.6 to work around
#447275
- debian/control.in:
=== modified file 'rules'
--- a/rules 2007-10-19 17:01:40 +0000
+++ b/rules 2007-10-19 17:04:56 +0000
@@ -643,8 +643,8 @@
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')
+# DEB_BUILD_OPTIONS=parallel=<n>
+NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n 's/^\(.*,\)\?parallel=\([0-9]\+\).*$$/\2/p')
ifneq "$(NUM_CPUS)" ""
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
endif
Reply to: