[gdal-grass] 06/11: Add patch to support hardening buildflags.

[Bas Couwenberg]

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

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

commit 556f4f3f5c35929b058ab649d50d3dfdfead0aea
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 9 15:14:35 2014 +0100

    Add patch to support hardening buildflags.
---
 debian/changelog         |  1 +
 debian/patches/hardening | 31 +++++++++++++++++++++++++++++++
 debian/patches/series    |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fe62ff1..6b311b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libgdal-grass (1.10.1-2) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Update watch file, also match gdal-1.10.x.
   * Use minimal dh rules with autoreconf, enable parallel builds.
+  * Add patch to support hardening buildflags.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 16 Jan 2014 00:02:08 +0100
 
diff --git a/debian/patches/hardening b/debian/patches/hardening
new file mode 100644
index 0000000..44a81d2
--- /dev/null
+++ b/debian/patches/hardening
@@ -0,0 +1,31 @@
+Description: Support hardening buildflags
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4,8 +4,10 @@ CXX	=	@CXX@
+ LD	=	@CXX@
+ 
+ CPPFLAGS = -DUSE_CPL -DGRASS_GISBASE=\"@GRASS_GISBASE@\" \
+-	  @GDAL_INC@ @GRASS_INCLUDE@ @CPPFLAGS@ 
++	  @GDAL_INC@ @GRASS_INCLUDE@ @CPPFLAGS@
+ CXXFLAGS = @CXX_WFLAGS@ @CXX_PIC@ 
++CFLAGS   = @CFLAGS@
++LDFLAGS  = @LDFLAGS@
+ 
+ RANLIB		=	@RANLIB@
+ SO_EXT		=	@SO_EXT@
+@@ -42,11 +44,11 @@ distclean: clean
+ 
+ 
+ $(GLIBNAME):	grass57dataset.o
+-	$(LD_SHARED) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
++	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
+ 
+ $(OLIBNAME):	ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o 
+-	$(LD_SHARED) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
++	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass64/lib
+ 
+ %.o:	%.cpp
+-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 954b10f..4e2bd55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 rpath
-
+hardening

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