[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.1+dfsg-2-5-gf4be3fd

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=be07a44

The following commit has been merged in the kubuntu_unstable branch:
commit be07a4484976d4b86df04138cbe8dc8e997960e2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Mar 11 00:52:47 2015 -0300

    Enable parallel building while bootstraping qmake.
    
    This reduces build time speciallyon slow-CPU's archs that have more than one
    core available.
    
    I have tested this patch without issues, but just for the sake of mental peace
    I have also writtrn to Qt's mailing list to ask if this is safe.
    
    I'll later remove this commits if it turns out not to be safe.
---
 debian/changelog | 3 +++
 debian/rules     | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c86bd29..c37e1cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qtbase-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
   * Update debian/README.source for new upstream code location
     and branching schemes.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Enable parallel building while bootstraping qmake.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Mar 2015 10:26:29 +0300
 
 qtbase-opensource-src (5.4.1+dfsg-2) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index c6fa335..9dc5ccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,11 +82,16 @@ else
 	$(error Unknown qmake mkspec for $(DEB_HOST_ARCH_OS))
 endif
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	./configure -confirm-license \
+	MAKEFLAGS="-j$(NUMJOBS)" ./configure \
+	            -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" \
 	            -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \

-- 
qtbase packaging