[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-6-3-gea74363
Pino Toscano
pino at alioth.debian.org
Tue Oct 1 17:24:53 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=ea74363
The following commit has been merged in the master branch:
commit ea74363e80bf1114a3ce6fc0c47d25021f633498
Author: Pino Toscano <pino at debian.org>
Date: Tue Oct 1 19:24:33 2013 +0200
fix build on m68k (#717685)
use -gstabs instead of -g
---
debian/changelog | 3 +++
debian/patches/stabs_format_debug_info.diff | 8 +++++---
debian/rules | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93dbac0..79e8b5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtwebkit (2.2.1-7) UNRELEASED; urgency=low
[ Nobuhiro Iwamatsu ]
* Fix build on Renesas sh4, using -gstabs instead of -g. (Closes: #694773)
+ [ Pino Toscano ]
+ * Fix build on m68k, using -gstabs instead of -g. (Closes: #717685)
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 01 Oct 2013 19:02:49 +0200
qtwebkit (2.2.1-6) unstable; urgency=low
diff --git a/debian/patches/stabs_format_debug_info.diff b/debian/patches/stabs_format_debug_info.diff
index 5007b4a..0d38be6 100644
--- a/debian/patches/stabs_format_debug_info.diff
+++ b/debian/patches/stabs_format_debug_info.diff
@@ -1,11 +1,13 @@
-Description: build s390, armel, mips* and sh4 debugging symbols with -gstabs
+Description: build s390, armel, mips*, sh4 and m68k debugging symbols with -gstabs
-g exhausts memory on these arches. Thanks to Oswald Buddenhagen for the hint.
Author: Sune Vuorela <sune at debian.org>
Author: Modestas Vainius <modax at debian.org>
Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+Author: Pino Toscano <pino at debian.org>
Bug-Debian: http://bugs.debian.org/528485
Bug-Debian: http://bugs.debian.org/618325
Bug-Debian: http://bugs.debian.org/694773
+Bug-Debian: http://bugs.debian.org/717685
---
Source/WebKit.pri | 7 +++++++
@@ -17,8 +19,8 @@ Bug-Debian: http://bugs.debian.org/694773
DEFINES += NDEBUG
}
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, sh) {
-+ message("s390, armel, armhf, mipsel and sh workaround for QtWebkit: do not build with -g, but with -gstabs")
++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, sh)|equals(QT_ARCH, m68k) {
++ message("s390, armel, armhf, mipsel, sh and m68k workaround for QtWebkit: do not build with -g, but with -gstabs")
+ QMAKE_CXXFLAGS -= -g
+ QMAKE_CXXFLAGS += -gstabs
+}
diff --git a/debian/rules b/debian/rules
index e65f1a5..8acbb32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ QWEBVIEW_DIR=debian/plugins/qwebview
# Filter -g from environment on troublesome arches. Replace it with -gstabs
# See also: stabs_format_debug_info.diff
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel sh4))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel armhf mips mipsel sh4 m68k))
export DEB_CFLAGS_MAINT_STRIP := -g
export DEB_CFLAGS_MAINT_APPEND := -gstabs
export DEB_CXXFLAGS_MAINT_STRIP := -g
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list