[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. debian/8.0.2-1-12-g1295d1d

[Jakub Adam]

The following commit has been merged in the master branch:
commit 1295d1dae66a7ca647f088bc0a2c86187b9593ee
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jun 21 22:57:59 2012 +0200

    Use default CPPFLAGS in jni library build
    
    Enables Fortify Source functions, one false positive
    hardening-no-fortify-functions warning was overriden.

diff --git a/debian/changelog b/debian/changelog
index 9ca6c92..eba77dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ eclipse-cdt (8.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Compile for Java 1.6.
+  * Use default CPPFLAGS in jni library build.
+    - Enables Fortify Source functions.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 10 May 2012 23:17:12 +0200
 
diff --git a/debian/eclipse-cdt-jni.lintian-overrides b/debian/eclipse-cdt-jni.lintian-overrides
new file mode 100644
index 0000000..739b843
--- /dev/null
+++ b/debian/eclipse-cdt-jni.lintian-overrides
@@ -0,0 +1,2 @@
+eclipse-cdt-jni: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/jni/libpty.so
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eb312d6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-default-cppflags.patch
diff --git a/debian/patches/use-default-cppflags.patch b/debian/patches/use-default-cppflags.patch
new file mode 100644
index 0000000..4f547cb
--- /dev/null
+++ b/debian/patches/use-default-cppflags.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 21 Jun 2012 22:58:17 +0200
+Subject: use-default-cppflags
+
+---
+ core/org.eclipse.cdt.core.linux/library/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/org.eclipse.cdt.core.linux/library/Makefile b/core/org.eclipse.cdt.core.linux/library/Makefile
+index 6e67977..4e10da3 100644
+--- a/core/org.eclipse.cdt.core.linux/library/Makefile
++++ b/core/org.eclipse.cdt.core.linux/library/Makefile
+@@ -12,7 +12,7 @@ JDK_INCLUDES= $(JAVA_HOME)/include
+ JDK_OS_INCLUDES= $(JAVA_HOME)/include/$(OS)
+ 
+ CC=gcc
+-CPPFLAGS = -I. -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
++CPPFLAGS += -I. -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
+ CFLAGS +=-fpic -D_REENTRANT -D_GNU_SOURCE
+ 
+ INSTALL_DIR = ../../org.eclipse.cdt.core.linux.$(ARCH)/os/$(OS)/$(ARCH)

-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.