From ba33c1b2115d01eb6e3f4d087d4cd2bb92ff7129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 28 Feb 2016 02:18:58 +0100 Subject: Allow parallel make for i18n packages on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 639c18e5e10b68f5dea1b68665ba08b2e25f08e5) --- debian/lenny/applications/gwenview-i18n/debian/rules | 9 +++++++-- debian/lenny/applications/k3b-i18n/debian/rules | 9 +++++++-- debian/lenny/applications/koffice-i18n/debian/rules | 9 +++++++-- debian/lenny/tde-i18n/debian/rules | 11 ++++++++--- debian/squeeze/applications/gwenview-i18n/debian/rules | 9 +++++++-- debian/squeeze/applications/k3b-i18n/debian/rules | 9 +++++++-- debian/squeeze/applications/koffice-i18n/debian/rules | 9 +++++++-- debian/squeeze/tde-i18n/debian/rules | 11 ++++++++--- 8 files changed, 58 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/lenny/applications/gwenview-i18n/debian/rules b/debian/lenny/applications/gwenview-i18n/debian/rules index 67e4d1a9a..325dadb2d 100755 --- a/debian/lenny/applications/gwenview-i18n/debian/rules +++ b/debian/lenny/applications/gwenview-i18n/debian/rules @@ -9,6 +9,11 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -42,7 +47,7 @@ build: debian/build-stamp debian/build-stamp: dh_testdir - $(MAKE) + $(MAKE) $(DEB_MAKE_PARALLEL) touch debian/build-stamp install/gwenview-i18n-trinity:: @@ -50,7 +55,7 @@ install/gwenview-i18n-trinity:: dh_testroot dh_clean -k - $(MAKE) install DESTDIR=$(CURDIR)/debian/gwenview-i18n-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/gwenview-i18n-trinity $(DEB_MAKE_PARALLEL) for LANG in $(DOC_LANGS); do \ cd $(CURDIR)/debian/gwenview-i18n-trinity/$(kde_htmldir)/$$LANG/gwenview; \ diff --git a/debian/lenny/applications/k3b-i18n/debian/rules b/debian/lenny/applications/k3b-i18n/debian/rules index 9c9661607..87d47158c 100755 --- a/debian/lenny/applications/k3b-i18n/debian/rules +++ b/debian/lenny/applications/k3b-i18n/debian/rules @@ -15,6 +15,11 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -63,7 +68,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - $(MAKE) + $(MAKE) $(DEB_MAKE_PARALLEL) #/usr/bin/docbook-to-man debian/k3b-i18n.sgml > k3b-i18n.1 touch build-stamp @@ -91,7 +96,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/k3b-i18n-trinity. - $(MAKE) install DESTDIR=$(CURDIR)/debian/k3b-i18n-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/k3b-i18n-trinity $(DEB_MAKE_PARALLEL) mkdir -p $(CURDIR)/debian/k3b-i18n-trinity$(DEB_CONFIGURE_PREFIX)/share/doc/tde/ # Build architecture-independent files here. diff --git a/debian/lenny/applications/koffice-i18n/debian/rules b/debian/lenny/applications/koffice-i18n/debian/rules index 82e0c4c13..00a275f9e 100755 --- a/debian/lenny/applications/koffice-i18n/debian/rules +++ b/debian/lenny/applications/koffice-i18n/debian/rules @@ -3,6 +3,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -28,7 +33,7 @@ endif cd $$i && \ autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \ ./configure $(configkde); \ - $(MAKE); \ + $(MAKE) $(DEB_MAKE_PARALLEL); \ cd ..; \ done @@ -54,7 +59,7 @@ binary-indep: build ( \ cd $$i && \ echo $$(install_dir) && \ - $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity; \ + $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \ cd .. \ ) \ done diff --git a/debian/lenny/tde-i18n/debian/rules b/debian/lenny/tde-i18n/debian/rules index fcbacb90a..c5ae84be2 100755 --- a/debian/lenny/tde-i18n/debian/rules +++ b/debian/lenny/tde-i18n/debian/rules @@ -22,6 +22,11 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + configkde=\ --disable-rpath \ --prefix=$(DEB_CONFIGURE_PREFIX) \ @@ -57,13 +62,13 @@ $(STAMP_BUILD): $(MAKE) -f ../admin/Makefile.common && \ cd build && \ ../configure --build=build $(configkde) && \ - $(MAKE); \ + $(MAKE) $(DEB_MAKE_PARALLEL); \ fi if [ -e $(cur_lang_dir)/CMakeLists.txt ]; then \ ([ -e $(cur_lang_dir)/cmake ] || ln -s ../cmake $(cur_lang_dir)) && \ cd $(cur_lang_dir)/build && \ cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \ - $(MAKE); \ + $(MAKE) $(DEB_MAKE_PARALLEL); \ fi touch $@ @@ -87,7 +92,7 @@ install:: $(I18N_INSTALL) cp -aR debian/$(I18N_DEST_PREFIX)-zh_TW-trinity/* debian/$(I18N_DEST_PREFIX)-zhtw-trinity/ $(I18N_INSTALL): - cd $(cur_lang_dir)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity + cd $(cur_lang_dir)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity $(DEB_MAKE_PARALLEL) clean: $(I18N_CLEAN) debian-clean diff --git a/debian/squeeze/applications/gwenview-i18n/debian/rules b/debian/squeeze/applications/gwenview-i18n/debian/rules index ec8ece95d..069018570 100755 --- a/debian/squeeze/applications/gwenview-i18n/debian/rules +++ b/debian/squeeze/applications/gwenview-i18n/debian/rules @@ -9,6 +9,11 @@ include /usr/share/cdbs/1/rules/utils.mk -include debian/debiandirs +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -42,7 +47,7 @@ build: debian/build-stamp debian/build-stamp: dh_testdir - $(MAKE) + $(MAKE) $(DEB_MAKE_PARALLEL) touch debian/build-stamp install/gwenview-i18n-trinity:: @@ -50,7 +55,7 @@ install/gwenview-i18n-trinity:: dh_testroot dh_clean -k - $(MAKE) install DESTDIR=$(CURDIR)/debian/gwenview-i18n-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/gwenview-i18n-trinity $(DEB_MAKE_PARALLEL) for LANG in $(DOC_LANGS); do \ cd $(CURDIR)/debian/gwenview-i18n-trinity/$(kde_htmldir)/$$LANG/gwenview; \ diff --git a/debian/squeeze/applications/k3b-i18n/debian/rules b/debian/squeeze/applications/k3b-i18n/debian/rules index 9c9661607..87d47158c 100755 --- a/debian/squeeze/applications/k3b-i18n/debian/rules +++ b/debian/squeeze/applications/k3b-i18n/debian/rules @@ -15,6 +15,11 @@ DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -63,7 +68,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - $(MAKE) + $(MAKE) $(DEB_MAKE_PARALLEL) #/usr/bin/docbook-to-man debian/k3b-i18n.sgml > k3b-i18n.1 touch build-stamp @@ -91,7 +96,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/k3b-i18n-trinity. - $(MAKE) install DESTDIR=$(CURDIR)/debian/k3b-i18n-trinity + $(MAKE) install DESTDIR=$(CURDIR)/debian/k3b-i18n-trinity $(DEB_MAKE_PARALLEL) mkdir -p $(CURDIR)/debian/k3b-i18n-trinity$(DEB_CONFIGURE_PREFIX)/share/doc/tde/ # Build architecture-independent files here. diff --git a/debian/squeeze/applications/koffice-i18n/debian/rules b/debian/squeeze/applications/koffice-i18n/debian/rules index 82e0c4c13..00a275f9e 100755 --- a/debian/squeeze/applications/koffice-i18n/debian/rules +++ b/debian/squeeze/applications/koffice-i18n/debian/rules @@ -3,6 +3,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) @@ -28,7 +33,7 @@ endif cd $$i && \ autoreconf && automake -f && $(MAKE) -f ../admin/Makefile.common && \ ./configure $(configkde); \ - $(MAKE); \ + $(MAKE) $(DEB_MAKE_PARALLEL); \ cd ..; \ done @@ -54,7 +59,7 @@ binary-indep: build ( \ cd $$i && \ echo $$(install_dir) && \ - $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity; \ + $(MAKE) install DESTDIR=`pwd`/../debian/$$i-trinity $(DEB_MAKE_PARALLEL); \ cd .. \ ) \ done diff --git a/debian/squeeze/tde-i18n/debian/rules b/debian/squeeze/tde-i18n/debian/rules index fcbacb90a..c5ae84be2 100755 --- a/debian/squeeze/tde-i18n/debian/rules +++ b/debian/squeeze/tde-i18n/debian/rules @@ -22,6 +22,11 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +DEB_MAKE_PARALLEL ?= $(and $(DEB_BUILD_PARALLEL),$(DEB_PARALLEL_JOBS),-j$(DEB_PARALLEL_JOBS)) + configkde=\ --disable-rpath \ --prefix=$(DEB_CONFIGURE_PREFIX) \ @@ -57,13 +62,13 @@ $(STAMP_BUILD): $(MAKE) -f ../admin/Makefile.common && \ cd build && \ ../configure --build=build $(configkde) && \ - $(MAKE); \ + $(MAKE) $(DEB_MAKE_PARALLEL); \ fi if [ -e $(cur_lang_dir)/CMakeLists.txt ]; then \ ([ -e $(cur_lang_dir)/cmake ] || ln -s ../cmake $(cur_lang_dir)) && \ cd $(cur_lang_dir)/build && \ cmake .. $(DEB_CMAKE_EXTRA_FLAGS) && \ - $(MAKE); \ + $(MAKE) $(DEB_MAKE_PARALLEL); \ fi touch $@ @@ -87,7 +92,7 @@ install:: $(I18N_INSTALL) cp -aR debian/$(I18N_DEST_PREFIX)-zh_TW-trinity/* debian/$(I18N_DEST_PREFIX)-zhtw-trinity/ $(I18N_INSTALL): - cd $(cur_lang_dir)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity + cd $(cur_lang_dir)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity $(DEB_MAKE_PARALLEL) clean: $(I18N_CLEAN) debian-clean -- cgit v1.2.1