[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-7-ga7e533f
Pino Toscano
pino at alioth.debian.org
Wed Aug 10 19:54:29 UTC 2011
The following commit has been merged in the master branch:
commit a7e533fe01f7d10445c049089251302e19d69d5d
Author: Pino Toscano <pino at debian.org>
Date: Wed Aug 10 21:54:13 2011 +0200
add -gstabs to the C(XX)FLAGS also for s390x (#637004)
---
debian/changelog | 1 +
debian/rules | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79a9a21..cf1ed24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qtwebkit (2.1.0~2011week13-3) UNRELEASED; urgency=low
- kfreebsd-i386 kfreebsd-amd64 hurd-i386 -> !linux-any
* Add patch s390.diff from upstream to support s390x. (Closes: #637004)
* Patch 05_sparc_unaligned_access.diff: reduce unneeded changes.
+ * Add -gstabs to the C(XX)FLAGS also for s390x. (see #637004)
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 21 Jun 2011 12:52:21 +0200
diff --git a/debian/rules b/debian/rules
index c12a524..f46b88a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
# 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 armel mips mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390 s390x armel mips mipsel))
export CFLAGS := $(filter-out -g,$(CFLAGS)) -gstabs
export CXXFLAGS := $(filter-out -g,$(CXXFLAGS)) -gstabs
endif
--
QtWebKit packaging
More information about the pkg-kde-commits
mailing list