[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.4+dfsg-2-3-g90a4a36

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Tue May 7 03:13:20 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=078cf1f

The following commit has been merged in the experimental branch:
commit 078cf1f9012b7204dbfbc74ef91e8a37b3a74efc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 6 22:24:21 2013 -0300

    Add armhf to the list of archs that should not use pch to avoid FTBFSs.
---
 debian/changelog |    3 ++-
 debian/rules     |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb2cee4..35d5f14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qt4-x11 (4:4.8.4+dfsg-3) UNRELEASED; urgency=low
 
-
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add armhf to the list of archs that should not use pch to avoid FTBFSs.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 May 2013 21:00:32 -0300
 
diff --git a/debian/rules b/debian/rules
index 4c4d5ac..90af16f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,8 @@ else
   endif
 endif
 
-ifeq ($(DEB_HOST_ARCH),ia64)
+no_pch_architectures := armhf ia64
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
 	extra_configure_opts += -no-pch
 endif
 

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list