[SCM] Qt 4 packaging branch, qt4.7.3, updated. debian/4.7.3-8-2-gf16b28c

Pino Toscano pino at alioth.debian.org
Wed Dec 14 13:24:43 UTC 2011


The following commit has been merged in the qt4.7.3 branch:
commit f16b28c1f5e1389446b42453b8b598c67195ebc1
Author: Pino Toscano <pino at debian.org>
Date:   Wed Dec 14 14:22:35 2011 +0100

    force a non-parallel build on ia64
    
    maybe it fixes the build on this arch...
---
 debian/changelog |    2 ++
 debian/rules     |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10eacfc..46b7e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qt4-x11 (4:4.7.3-9) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Force a non-parallel build on ia64, maybe it fixes the build on this arch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 14 Dec 2011 14:15:47 +0100
 
diff --git a/debian/rules b/debian/rules
index 7e862a0..2ef477b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,8 +64,12 @@ else
 	platform_arg = glibc-g++
 endif
 
+ifneq ($(DEB_HOST_ARCH),ia64)
+	extra_dh_opts += --parallel
+endif
+
 %:
-	dh $@ --parallel --with pkgkde_symbolshelper
+	dh $@ $(extra_dh_opts) --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
 	# Test broken hppa kernel with glibc >= 2.5

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list