[gdal] 10/15: Don't use -Werror=format-security, causes build failure on ogrsxfdatasource.cpp.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch experimental
in repository gdal.

commit 62e0c6cbf7a5b292c1e27a0cf1afbc94afb903c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 3 02:47:30 2014 +0200

    Don't use -Werror=format-security, causes build failure on ogrsxfdatasource.cpp.
---
 debian/changelog |  2 ++
 debian/rules     | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6ebceae..4113381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ gdal (1.11.0+dfsg-1) UNRELEASED; urgency=low
   * Refresh patches.
   * Update install paths for new upstream version.
   * Add libpcre3-dev build dependency.
+  * Don't use -Werror=format-security, causes build failure on
+    ogrsxfdatasource.cpp.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 30 Apr 2014 20:10:05 +0200
 
diff --git a/debian/rules b/debian/rules
index 581b161..ed603fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# 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)
@@ -113,7 +120,8 @@ override_dh_auto_configure:
 			--with-libkml=yes \
 			--with-armadillo=yes \
 			--with-liblzma=yes \
-			--with-epsilon=/usr; \
+			--with-epsilon=/usr \
+			CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"; \
 		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