On Mon, Jun 05, 2017 at 10:44:59AM +0200, Rene Engelhard wrote:
>...
> This looks unnecessarily ugly to me (or I miss something). Why not use
> dpkg-buildflags' mechanism for this? See e.g.
>...
> In this case maybe _APPEND -g1 (if you don't do the _STRIP)
Thanks, your _APPEND suggestion is much better than my original patch.
Sandro, the debdiff of my upload is attached.
> Regards,
>
> Rene
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diffstat for qtwebengine-opensource-src-5.7.1+dfsg
qtwebengine-opensource-src-5.7.1+dfsg
changelog | 8 ++++++++
rules | 8 ++++++++
2 files changed, 16 insertions(+)
diff -Nru qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog
qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog
--- qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog 2017-01-18
20:08:01.000000000 +0200
+++ qtwebengine-opensource-src-5.7.1+dfsg/debian/changelog 2017-06-05
16:16:54.000000000 +0300
@@ -1,3 +1,11 @@
+qtwebengine-opensource-src (5.7.1+dfsg-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with -g1 instead of -g on 32bit architectures.
+ (Closes: #863927)
+
+ -- Adrian Bunk <b...@debian.org> Mon, 05 Jun 2017 16:16:54 +0300
+
qtwebengine-opensource-src (5.7.1+dfsg-6) unstable; urgency=medium
[ Sandro Knauß ]
diff -Nru qtwebengine-opensource-src-5.7.1+dfsg/debian/rules
qtwebengine-opensource-src-5.7.1+dfsg/debian/rules
--- qtwebengine-opensource-src-5.7.1+dfsg/debian/rules 2017-01-18
20:00:38.000000000 +0200
+++ qtwebengine-opensource-src-5.7.1+dfsg/debian/rules 2017-06-05
16:16:54.000000000 +0300
@@ -6,6 +6,14 @@
export NINJAFLAGS=-v
include /usr/share/dpkg/default.mk
+DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
+
+# TODO: properly integrate with the other debug setting
+ifeq (32,$(DEB_HOST_ARCH_BITS))
+ export DEB_CFLAGS_MAINT_APPEND = -g1
+ export DEB_CXXFLAGS_MAINT_APPEND = -g1
+endif
+
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags
--get CPPFLAGS)
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell
dpkg-buildflags --get CPPFLAGS)
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
