[SCM] QtWebKit packaging branch, master, updated. debian/2.3.2.dfsg-3-7-ga886151

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=14941b1

The following commit has been merged in the master branch:
commit 14941b195ca479d1eb995aa76e624010a3b0a143
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Sep 12 19:12:16 2014 +0200

    Export build flags to build-webkit.
---
 debian/changelog |  3 +++
 debian/rules     | 24 ++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69fcedf..0ad9489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ qtwebkit (2.3.2.dfsg-4) UNRELEASED; urgency=medium
   * Add Steven Chamberlain's nonlinux_enable_glib_support.patch to use glibc in
     kFreeBSD-* and Hurd (Closes: #760727). Thanks *a lot* to everyone involved.
 
+  [ Felix Geyer ]
+  * Export build flags to build-webkit.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Sep 2014 15:22:09 -0300
 
 qtwebkit (2.3.2.dfsg-3) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 918bafc..6d198fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,29 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export DEB_CFLAGS_MAINT_STRIP = -g
+export DEB_CXXFLAGS_MAINT_STRIP = -g
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # only enable debugging symbols on archs supporting -gstabs
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), amd64 i386 powerpc s390x))
-    QMAKE_CXXFLAGS := "--qmakearg=\"QMAKE_CXXFLAGS+=-gstabs\""
+    export DEB_CFLAGS_MAINT_APPEND = -gstabs
+    export DEB_CXXFLAGS_MAINT_APPEND = -gstabs
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
-    export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-relax
+    export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-relax
 endif
 
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
+QMAKE_ARGS := "--qmakearg=\"QMAKE_CFLAGS_RELEASE=$(CFLAGS) $(CPPFLAGS)\""
+QMAKE_ARGS += "--qmakearg=\"QMAKE_CXXFLAGS_RELEASE=$(CXXFLAGS) $(CPPFLAGS)\""
+QMAKE_ARGS += "--qmakearg=\"QMAKE_LFLAGS_RELEASE=$(LDFLAGS)\""
+
 export QMAKEPATH=Tools/qmake
 export QTDIR=/usr
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -32,11 +44,11 @@ override_dh_auto_build:
 #disable WTF_USE_3D_GRAPHICS on ARM where it doesn't compile
 #disable forcing SSE2 on all other platforms
 ifneq (,$(filter arm64 armel hppa mips mipsel powerpc ppc64el s390x x32,$(DEB_HOST_ARCH)))
-	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_CXXFLAGS)
+	./Tools/Scripts/build-webkit --qt DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS)
 else ifeq ($(DEB_HOST_ARCH),armhf)
-	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_CXXFLAGS)
+	./Tools/Scripts/build-webkit --qt DEFINES+=WTF_USE_3D_GRAPHICS=0 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0 $(QMAKE_ARGS)
 else
-	./Tools/Scripts/build-webkit --qt $(QMAKE_CXXFLAGS) --no-force-sse2
+	./Tools/Scripts/build-webkit --qt $(QMAKE_ARGS) --no-force-sse2
 endif
 
 override_dh_auto_install:

-- 
QtWebKit packaging