ce884005 | 2019-07-12 14:09:03 | Slávek Banko |
DEB: Change remaining DEB_BUILD_PARALLEL in 'rules' to make them conditional. Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M debian/_base/dependencies/libr/debian/rules M debian/_base/dependencies/tqt3/debian/rules M debian/_base/dependencies/tqtinterface/debian/rules M debian/_base/tde-i18n/debian/rules M ubuntu/_base/dependencies/libr/debian/rules M ubuntu/_base/dependencies/tqt3/debian/rules M ubuntu/_base/dependencies/tqtinterface/debian/rules M ubuntu/_base/tde-i18n/debian/rules |
||
debian/_base/dependencies/libr/debian/rulesdiff --git a/debian/_base/dependencies/libr/debian/rules b/debian/_base/dependencies/libr/debian/rules index 1b6b94b..5d37a7e 100755 --- a/debian/_base/dependencies/libr/debian/rules +++ b/debian/_base/dependencies/libr/debian/rules @@ -4,7 +4,7 @@ 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) debian/_base/dependencies/tqt3/debian/rulesdiff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index d69ef20..3857356 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -20,7 +20,7 @@ # 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++ debian/_base/dependencies/tqtinterface/debian/rulesdiff --git a/debian/_base/dependencies/tqtinterface/debian/rules b/debian/_base/dependencies/tqtinterface/debian/rules index d642db9..0e9194d 100755 --- a/debian/_base/dependencies/tqtinterface/debian/rules +++ b/debian/_base/dependencies/tqtinterface/debian/rules @@ -23,6 +23,6 @@ # 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) debian/_base/tde-i18n/debian/rulesdiff --git a/debian/_base/tde-i18n/debian/rules b/debian/_base/tde-i18n/debian/rules index 8c85d66..2427e42 100755 --- a/debian/_base/tde-i18n/debian/rules +++ b/debian/_base/tde-i18n/debian/rules @@ -22,7 +22,7 @@ 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))) ubuntu/_base/dependencies/libr/debian/rulesdiff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules index 1b6b94b..5d37a7e 100755 --- a/ubuntu/_base/dependencies/libr/debian/rules +++ b/ubuntu/_base/dependencies/libr/debian/rules @@ -4,7 +4,7 @@ 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) ubuntu/_base/dependencies/tqt3/debian/rulesdiff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index d69ef20..3857356 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -20,7 +20,7 @@ # 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++ ubuntu/_base/dependencies/tqtinterface/debian/rulesdiff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules index d642db9..0e9194d 100755 --- a/ubuntu/_base/dependencies/tqtinterface/debian/rules +++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules @@ -23,6 +23,6 @@ # 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) ubuntu/_base/tde-i18n/debian/rulesdiff --git a/ubuntu/_base/tde-i18n/debian/rules b/ubuntu/_base/tde-i18n/debian/rules index 8c85d66..2427e42 100755 --- a/ubuntu/_base/tde-i18n/debian/rules +++ b/ubuntu/_base/tde-i18n/debian/rules @@ -22,7 +22,7 @@ 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))) |