[SCM] qtbase packaging branch, experimental, updated. debian/5.3.1+dfsg-3-10-gbff1c9d
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Sep 1 19:25:51 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=24a592f
The following commit has been merged in the experimental branch:
commit 24a592f59f7629973dbb6469ddc8bdbeb71e64fd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Sep 1 16:24:13 2014 -0300
Disable pre compiled headers support for this kind of build.
---
debian/changelog | 2 ++
debian/rules | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 61889e8..5685caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ qtbase-opensource-src (5.3.1+dfsg-5) UNRELEASED; urgency=medium
for the pointer.
* Build SSE2 enabled libraries in override_dh_auto_install-arch in order to
avoid rewriting the previously built versions before installing them.
+ * Disable pre compiled headers support when building both non SEE2 and SSE2
+ libraries, as it is not compatible.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 29 Aug 2014 14:38:34 -0300
diff --git a/debian/rules b/debian/rules
index a16830d..e71d5a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,8 +66,10 @@ ifneq ($(DEB_HOST_ARCH_OS),linux)
endif
# Compile without sse2 support on i386
+# Do not use pre compiled headers in order to be able to rebuild the gui
+# submodule.
ifeq ($(DEB_HOST_ARCH_CPU),i386)
- cpu_opt = -no-sse2
+ cpu_opt = -no-sse2 -no-pch
endif
ifeq ($(DEB_HOST_ARCH_OS),linux)
--
qtbase packaging
More information about the pkg-kde-commits
mailing list