diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2014-12-20 19:21:23 +0300 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2014-12-20 19:28:05 +0300 |
| commit | e0f931fc025966b98d315e27b70f65597277f6b1 (patch) | |
| tree | 9be6374cd0f8cb51d28acd013664787c2fba27b9 | |
| parent | 6a0efbe20cdcfb26378adaab9a96c5e325664da5 (diff) | |
| download | qt5webkit-e0f931fc025966b98d315e27b70f65597277f6b1.tar.gz | |
Disable precompiled headers on amd64, powerpc and s390x.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6efca76..15fa8ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ qtwebkit-opensource-src (5.4.0+dfsg-1) UNRELEASED; urgency=medium - blacklist_libkpartsplugin.patch * Bump Standards-Version to 3.9.6, no changes needed. + [ Harald Sitter ] + * Disable precompiled headers on amd64, powerpc and s390x. + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 19 Dec 2014 14:52:47 +0300 qtwebkit-opensource-src (5.3.2+dfsg-3) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 58e1609..6175d9a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) gstab_architectures := amd64 i386 powerpc s390x fulldebug_architectures := none disabled_jit_architectures := armel mips mipsel +disabled_pch_architectures := amd64 powerpc s390x %: dh $@ --parallel --dbg-package=libqt5webkit5-dbg --with pkgkde_symbolshelper @@ -40,6 +41,12 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_jit_architectur echo "QMAKE_CXXFLAGS += -DENABLE_JIT=0" >> .qmake.conf endif +# Disable header precompliation as it creates invalid includes on certain +# architectures causing build failure. LP: 1395661 +ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectures))) + echo "CONFIG -= precompile_header" >> .qmake.conf +endif + # Run qmake again now with the proper values. qmake |