From 9cdab9fd7a68b40b2dfce0aa6b3de2a30fdb3ebe Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 7 Aug 2015 04:46:55 +0200 Subject: [PATCH] use valgrind to debug qdoc HTML generation * Fri Aug 07 2015 Kevin Kofler - 5.5.0-15 - use valgrind to debug qdoc HTML generation --- qdoc.valgrind | 7 +++++++ qt5-qtbase.spec | 23 ++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 qdoc.valgrind diff --git a/qdoc.valgrind b/qdoc.valgrind new file mode 100644 index 0000000..4029563 --- /dev/null +++ b/qdoc.valgrind @@ -0,0 +1,7 @@ +#!/bin/bash + +# run process through valgrind instead + +DIRNAME=$(dirname $0) +set -x +valgrind ${DIRNAME}/qdoc.orig $@ diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 50ffdb7..657c677 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -2,6 +2,11 @@ %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9 ppc64le %define multilib_basearchs x86_64 ppc64 s390x sparc64 ppc64le +# use valgrind to debug qdoc HTML generation +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 +%global valgrind 1 +%endif + # support qtchooser (adds qtchooser .conf file) %define qtchooser 1 %if 0%{?qtchooser} @@ -39,13 +44,15 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.5.0 -Release: 14%{?dist} +Release: 15%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source2: qdoc.valgrind + # header file to workaround multilib issue # https://bugzilla.redhat.com/show_bug.cgi?id=1036956 Source5: qconfig-multilib.h @@ -134,6 +141,10 @@ Source1: macros.qt5 # RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support. %global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ +# for doc hacks +%if 0%{?valgrind} +BuildRequires: valgrind +%endif # for %%check BuildRequires: cmake BuildRequires: cups-devel @@ -466,7 +477,14 @@ pushd src/xml; ../../bin/qmake; popd # HACK to avoid multilib conflicts in noarch content # see also https://bugreports.qt-project.org/browse/QTBUG-42071 QT_HASH_SEED=0; export QT_HASH_SEED +%if 0%{?valgrind} +mv bin/qdoc bin/qdoc.orig +install %{SOURCE2} bin/qdoc +%endif make html_docs +%if 0%{?valgrind} +mv bin/qdoc.orig bin/qdoc -f +%endif make qch_docs %endif @@ -919,6 +937,9 @@ fi %changelog +* Fri Aug 07 2015 Kevin Kofler - 5.5.0-15 +- use valgrind to debug qdoc HTML generation + * Fri Aug 07 2015 Kevin Kofler - 5.5.0-14 - remove GDB hackery again, -12 built fine on i686, hack breaks ARM build - fix 10-qt5-check-opengl2.sh for multiple screens (#1245755)