[SCM] qtbase packaging branch, master, updated. debian/5.1.0+dfsg-3-4-g53cd195

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 53cd1955269f283fb7bb56231d97244ca6c39bd4
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 11 14:32:53 2013 +0200

    fix build on ia64 (disable perf events)
    
    they do not seem present on linux/ia64 kernels
---
 debian/changelog                  |    2 ++
 debian/patches/linux_no_perf.diff |   17 +++++++++++++++++
 debian/patches/series             |    1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af7ccb8..2066211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qtbase-opensource-src (5.1.0+dfsg-4) UNRELEASED; urgency=low
   * Fix build of the SHA3 implementation on 64bit big endian architectures
     (e.g. s390x and ppc64); patch sha3_64bit_BE.diff.
   * Update/simplify lintian overrides.
+  * Fix build on ia64 by disabling the use of Linux perf events, which do not
+    seem present on linux/ia64 kernels; patch linux_no_perf.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 11 Aug 2013 11:40:49 +0200
 
diff --git a/debian/patches/linux_no_perf.diff b/debian/patches/linux_no_perf.diff
new file mode 100644
index 0000000..bd25707
--- /dev/null
+++ b/debian/patches/linux_no_perf.diff
@@ -0,0 +1,17 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: Disable perf events on Linux/ia64.
+ It seems ia64 does not have perf events compiled, so disable them.
+Last-Update: 2013-08-11
+Forwarded: no
+
+--- a/src/testlib/qbenchmark_p.h
++++ b/src/testlib/qbenchmark_p.h
+@@ -63,7 +63,7 @@
+ #undef QTESTLIB_USE_VALGRIND
+ #endif
+ 
+-#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID)
++#if defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) && !defined(Q_OS_ANDROID) && !defined(Q_PROCESSOR_IA64)
+ #define QTESTLIB_USE_PERF_EVENTS
+ #else
+ #undef QTESTLIB_USE_PERF_EVENTS
diff --git a/debian/patches/series b/debian/patches/series
index 61d7370..6941803 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 deppath_gnu.diff
 Dont_check_for_the_existence_of_priv_inc_dirs.patch
 sha3_64bit_BE.diff
+linux_no_perf.diff
 
 # Debian specific.

-- 
qtbase packaging