[gdal] 01/01: Don't filter out -Werror=format-security, fixed upstream. (closes: #834174)

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository gdal.

commit 203e38ebd8abc63aadab33ef2ef468a8c5f79650
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 12 20:27:28 2016 +0200

    Don't filter out -Werror=format-security, fixed upstream. (closes: #834174)
---
 debian/changelog |  2 ++
 debian/rules     | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eeadc97..712d7cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gdal (2.1.1+dfsg-2) UNRELEASED; urgency=medium
   * Strip pre-releases from symbols version.
   * Update symbols for alpha, hppa & sparc64.
   * Add libgdal-grass to gdal-bin Suggests.
+  * Don't filter out -Werror=format-security, fixed upstream.
+    (closes: #834174)
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 13 Jul 2016 21:27:58 +0200
 
diff --git a/debian/rules b/debian/rules
index e57d1c5..4965661 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
-# Remove -Werror=format-security, causes build failure on ogrsxfdatasource.cpp
-CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
-
-CFLAGS   := $(filter-out -Werror=format-security, $(CFLAGS))
-CXXFLAGS := $(filter-out -Werror=format-security, $(CXXFLAGS))
-
 PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r)
 PYDEF=$(shell pyversions -dv)
 PERLDEF=$(shell perl -V:version|cut -d\' -f2)
@@ -127,8 +120,7 @@ override_dh_auto_configure:
 			--with-static-proj4=yes \
 			--with-java=/usr/lib/jvm/default-java \
 			--with-perl \
-			--with-python \
-			CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"; \
+			--with-python; \
 		mv GDALmake.opt GDALmake.opt-$$V; \
 	done
 

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