[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-2-gd3ee0a2
Fathi Boudra
fabo at alioth.debian.org
Fri May 21 07:56:59 UTC 2010
The following commit has been merged in the experimental-snapshots branch:
commit c2fea09316a8232b676fa3035b090769254a11a6
Author: Fathi Boudra <fabo at debian.org>
Date: Thu Mar 25 16:47:08 2010 +0100
Fix FTBFS on sparc caused by a wrong platform_arg value:
check for exact string match (instead of findstring usage).
---
debian/changelog | 2 ++
debian/rules | 13 ++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a3e534e..5a8d7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qt4-x11 (4:4.6.2-2) UNRELEASED; urgency=low
* Add upstream patch:
- 0001_qpixmap_load_no_modify_referenced_copies.diff
Fixed QPixmap::load() to not modify referenced copies.
+ * Fix FTBFS on sparc caused by a wrong platform_arg value:
+ check for exact string match (instead of findstring usage).
-- Fathi Boudra <fabo at debian.org> Fri, 19 Mar 2010 16:28:34 +0100
diff --git a/debian/rules b/debian/rules
index 2f8652e..9e137e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,13 +34,20 @@ ifeq ($(DEB_HOST_ARCH),arm)
extra_configure_opts += -DQT_QLOCALE_USES_FCVT
endif
-linux64_architectures := amd64 ia64 sparc64
ifeq ($(DEB_HOST_ARCH_OS),linux)
- ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(linux64_architectures)))
+ ifeq ($(DEB_HOST_ARCH),amd64)
platform_arg = linux-g++-64
else
+ ifeq ($(DEB_HOST_ARCH),ia64)
+ platform_arg = linux-g++-64
+ else
+ ifeq ($(DEB_HOST_ARCH),sparc64)
+ platform_arg = linux-g++-64
+ else
platform_arg = linux-g++
- endif
+ endif # sparc64
+ endif # ia64
+ endif # amd64
else
platform_arg = glibc-g++
endif
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list