[merkaartor] 16/23: Add patch to add hardening buildflags to qmake build.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository merkaartor.

commit 072872a7ebb5770e346072f81027c7d91061aa68
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 18 15:18:04 2015 +0200

    Add patch to add hardening buildflags to qmake build.
---
 debian/changelog                          |  1 +
 debian/patches/hardening-buildflags.patch | 16 ++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 268f40d..9acbd2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium
   * Use dh_auto_* commands in overrides.
   * Disable SpatiaLite support, causes FTBFS.
   * Add patch to fix various typos.
+  * Add patch to add hardening buildflags to qmake build.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 18 Sep 2015 01:17:53 +0200
 
diff --git a/debian/patches/hardening-buildflags.patch b/debian/patches/hardening-buildflags.patch
new file mode 100644
index 0000000..8b6e69a
--- /dev/null
+++ b/debian/patches/hardening-buildflags.patch
@@ -0,0 +1,16 @@
+Description: Add hardening buildflags to qmake build.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/src/Config.pri
++++ b/src/Config.pri
+@@ -36,3 +36,10 @@ win32 {
+ }
+ 
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-reorder
++
++# Append buildflags set in the environment
++QMAKE_CPPFLAGS += $$(CPPFLAGS)
++QMAKE_CFLAGS   += $$(CFLAGS) $$(CPPFLAGS)
++QMAKE_CXXFLAGS += $$(CXXFLAGS) $$(CPPFLAGS)
++QMAKE_LFLAGS   += $$(LDFLAGS)
++
diff --git a/debian/patches/series b/debian/patches/series
index 9228595..24c3182 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
 quazip-qt5.patch
 various-typos.patch
+hardening-buildflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git