diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-07-12 16:09:03 +0200 | 
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-07-12 16:09:03 +0200 | 
| commit | ce884005cc801ed88a6ac15a274ba516d4616dc0 (patch) | |
| tree | 7ef3948b1db9cbf0dc41f1a535b642488c182adc | |
| parent | 8a26a5e770a1070cb4a877b121787fc8d2036fae (diff) | |
| download | tde-packaging-ce884005.tar.gz tde-packaging-ce884005.zip  | |
DEB: Change remaining DEB_BUILD_PARALLEL in 'rules' to make them conditional.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rwxr-xr-x | debian/_base/dependencies/libr/debian/rules | 2 | ||||
| -rwxr-xr-x | debian/_base/dependencies/tqt3/debian/rules | 2 | ||||
| -rwxr-xr-x | debian/_base/dependencies/tqtinterface/debian/rules | 2 | ||||
| -rwxr-xr-x | debian/_base/tde-i18n/debian/rules | 2 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/libr/debian/rules | 2 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/tqt3/debian/rules | 2 | ||||
| -rwxr-xr-x | ubuntu/_base/dependencies/tqtinterface/debian/rules | 2 | ||||
| -rwxr-xr-x | ubuntu/_base/tde-i18n/debian/rules | 2 | 
8 files changed, 8 insertions, 8 deletions
diff --git a/debian/_base/dependencies/libr/debian/rules b/debian/_base/dependencies/libr/debian/rules index 1b6b94b3e..5d37a7e50 100755 --- a/debian/_base/dependencies/libr/debian/rules +++ b/debian/_base/dependencies/libr/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk  include /usr/share/cdbs/1/class/cmake.mk  include /usr/share/cdbs/1/rules/utils.mk -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \                                 && echo xz || echo bzip2) diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index d69ef202b..38573561f 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -20,7 +20,7 @@ DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)  # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to  # never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  ifeq ($(DEB_HOST_ARCH_OS),hurd)  	PLATFORM_ARG = hurd-g++ diff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules index d642db97b..0e9194d0c 100755 --- a/debian/_base/dependencies/tqtinterface/debian/rules +++ b/debian/_base/dependencies/tqtinterface/debian/rules @@ -23,6 +23,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \  # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to  # never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) diff --git a/debian/_base/tde-i18n/debian/rules b/debian/_base/tde-i18n/debian/rules index 8c85d662c..2427e42f4 100755 --- a/debian/_base/tde-i18n/debian/rules +++ b/debian/_base/tde-i18n/debian/rules @@ -22,7 +22,7 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man  DEB_CONFIGURE_PREFIX := /opt/trinity  DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))  	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index 1b6b94b3e..5d37a7e50 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk  include /usr/share/cdbs/1/class/cmake.mk  include /usr/share/cdbs/1/rules/utils.mk -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \                                 && echo xz || echo bzip2) diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index d69ef202b..38573561f 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -20,7 +20,7 @@ DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)  # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to  # never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  ifeq ($(DEB_HOST_ARCH_OS),hurd)  	PLATFORM_ARG = hurd-g++ diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index d642db97b..0e9194d0c 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -23,6 +23,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \  # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to  # never build in parallel, regardless of DEB_BUILD_OPTIONS. -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) diff --git a/ubuntu/_base/tde-i18n/debian/rules b/ubuntu/_base/tde-i18n/debian/rules index 8c85d662c..2427e42f4 100755 --- a/ubuntu/_base/tde-i18n/debian/rules +++ b/ubuntu/_base/tde-i18n/debian/rules @@ -22,7 +22,7 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man  DEB_CONFIGURE_PREFIX := /opt/trinity  DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL ?= true  ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))  	DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))  | 
