[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.8.0_rc3-2-4-g2c61a61

Thu Jun 7 21:04:44 UTC 2012

The following commit has been merged in the master-3.8 branch:
commit dd2d6d8e9d05083a26188d6ccf037fd345c8dee5
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jun 7 22:27:28 2012 +0200

    Use default build flags during compilation of native binaries

diff --git a/debian/changelog b/debian/changelog
index 3361118..2f925b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse (3.8.0~rc3-3) UNRELEASED; urgency=low
 
   * Increase debhelper compatibility to level 9.
+  * Use default build flags during compilation of native binaries.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 07 Jun 2012 19:47:52 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index d3e1cf9..6044264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,4 @@ generate-additional-archs.patch
 eclipse-add-archs-net.patch
 install-libgnomeproxy-to-jni-directory.patch
 eclipse-help-fix-jsp-precompilation.patch
+use-deb-build-compiler-flags.patch
diff --git a/debian/patches/use-deb-build-compiler-flags.patch b/debian/patches/use-deb-build-compiler-flags.patch
new file mode 100644
index 0000000..1c5a409
--- /dev/null
+++ b/debian/patches/use-deb-build-compiler-flags.patch
@@ -0,0 +1,144 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 7 Jun 2012 21:58:11 +0200
+Subject: use-deb-build-compiler-flags
+
+---
+ build.xml                                          |    2 +-
+ .../library/gtk/make_linux.mak                     |    6 +--
+ .../natives/unix/linux/Makefile                    |    6 +--
+ .../natives/unix/linux/makefile                    |    8 ++--
+ .../natives/unix/linux/x86_64/makefile             |   48 --------------------
+ 5 files changed, 11 insertions(+), 59 deletions(-)
+ delete mode 100644 eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
+
+diff --git a/build.xml b/build.xml
+index c62b934..da09fbf 100644
+--- a/build.xml
++++ b/build.xml
+@@ -352,7 +352,7 @@
+ 		<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
+ 
+ 		<!-- This one should be removed when Eclipse bug 369215 is fixed -->
+-		<patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" />
++		<!--patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" /-->
+ 
+ 		<patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" />
+ 
+diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
+index 9c64a31..5de09d3 100644
+--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
++++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak
+@@ -44,8 +44,8 @@ DLL = $(PROGRAM_LIBRARY)
+ #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
+ LIBS = -lpthread -ldl
+ GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+-LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
+-CFLAGS = ${M_ARCH} -g -s -Wall\
++LFLAGS = ${M_ARCH} ${LDFLAGS} -shared -fpic -Wl,--export-dynamic 
++CFLAGS := ${M_ARCH} ${CFLAGS} ${CPPFLAGS} -s -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-DMOZILLA_FIX \
+@@ -95,7 +95,7 @@ eclipseNix.o: ../eclipseNix.c
+ 	$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
+ 
+ $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+-	$(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
++	$(CC) ${LDFLAGS} ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ 	
+ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ 	$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
+index 1dc4f16..b9b3072 100644
+--- a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
++++ b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
+@@ -25,11 +25,11 @@ ifeq (${JAVA_HOME},)
+ endif
+ 
+ JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
+-OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++OPT_FLAGS= -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ core:
+-	gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
+-	gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
++	gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) ${CFLAGS} ${CPPFLAGS}
++	gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc ${LDFLAGS}
+ 
+ clean:
+ 	rm -f $(CORE.O) $(LIB_NAME_FULL)
+diff --git a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+index 0aa0cbe..6f78532 100644
+--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
++++ b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+@@ -20,11 +20,11 @@ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+ 
+ OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
++INCLUDE = `pkg-config --cflags gconf-2.0`
++COMPILER_FLAGS = -fPIC -c ${CFLAGS} ${CPPFLAGS}
+ 
+-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+-LINKER_FLAGS= -m32
++LIBS := `pkg-config --libs gconf-2.0`
++LINKER_FLAGS= ${LDFLAGS}
+ 
+ all: link
+ 
+diff --git a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
+deleted file mode 100644
+index 407f9c5..0000000
+--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
++++ /dev/null
+@@ -1,48 +0,0 @@
+-#**********************************************************************
+-# Copyright (c) 2008, 2010 Oakland Software Incorporated and others.
+-# All rights reserved. This program and the accompanying materials 
+-# are made available under the terms of the Eclipse Public License v1.0
+-# which accompanies this distribution, and is available at
+-# http://www.eclipse.org/legal/epl-v10.html
+-#
+-# Contributors:
+-#	Oakland Software Incorporated - initial submission
+-#	IBM Corporation - refactoring, bug 245849
+-#	Tristan Tarrant - x86_64 support, bug 273072
+-#
+-#********************************************************************** 
+-#
+-# makefile for libgnomeproxy-1.0.0.so
+-
+-GNOMEPROXY.C = ../../gnomeproxy.c
+-GNOMEPROXY.O = gnomeproxy.o
+-LIB_NAME = gnomeproxy.so
+-LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+-
+-OS_TYPE = 
+-JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+-INCLUDE = `pkg-config --cflags gconf-2.0`
+-COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64
+-
+-LIBS := `pkg-config --libs gconf-2.0`
+-LINKER_FLAGS= -m64
+-
+-all: link
+-
+-compile:
+-	@echo "Building file: $(GNOMEPROXY.O)"
+-	@echo "Invoking: GCC C Compiler"
+-	gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
+-	@echo "Finished building: $(GNOMEPROXY.O)"
+-	@echo " "
+-
+-link: compile
+-	@echo "Building target: $(LIB_NAME_FULL)"
+-	@echo "Invoking: GCC C Linker"
+-	gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
+-	@echo "Finished building target: $(LIB_NAME_FULL)"
+-	@echo " "
+-
+-clean:
+-	-$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL)
+-	- at echo " "
+\ No newline at end of file

-- 
eclipse - Powerful IDE written in java - Debian package.

