[gdal] 01/01: Restore hardening patch for java changes applied upstream in trunk only.

[Sebastiaan Couwenberg]

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

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

commit d0884e49c6fc18d535a12413ebff839d9261c528
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 18 21:42:11 2015 +0200

    Restore hardening patch for java changes applied upstream in trunk only.
---
 debian/patches/hardening | 21 +++++++++++++++++++++
 debian/patches/series    |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/hardening b/debian/patches/hardening
new file mode 100644
index 0000000..fe23148
--- /dev/null
+++ b/debian/patches/hardening
@@ -0,0 +1,21 @@
+Description: Add support for all hardening buildflags.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/gdal/ticket/5998
+Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29360
+
+--- a/swig/java/GNUmakefile
++++ b/swig/java/GNUmakefile
+@@ -100,10 +100,10 @@ $(JAVA_MODULES): lib%jni.$(SO_EXT): %_wr
+ # Do not remove -fno-strict-aliasing while SWIG generates weird code in upcast methods
+ # See http://trac.osgeo.org/gdal/changeset/16006
+ %.$(OBJ_EXT): %.cpp
+-	$(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
++	$(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
+ 
+ %.$(OBJ_EXT): %.cxx
+-	$(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
++	$(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
+ 
+ %.$(OBJ_EXT): %.c
+-	$(CC) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
++	$(CC) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
diff --git a/debian/patches/series b/debian/patches/series
index a7979fc..aa1be10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@ ecw-plugin
 mrsid-plugin
 spatialite
 java.opt
+hardening
 perl-vendor

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