Remove orbit2 dependency.
2012-01-20 Sami Wagiaalla <swagiaal@redhat.com>
* patches/eclipse-dont-link-in-orbit2.patch: New patch.
* build.xml: Apply patch eclipse-dont-link-in-orbit2.patch.
Conflicts:
eclipse-build/ChangeLog
eclipse-build/build.xml
diff --git a/eclipse-build/ChangeLog b/eclipse-build/ChangeLog
index d7c632d..927603d 100644
--- a/eclipse-build/ChangeLog
+++ b/eclipse-build/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-20 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * patches/eclipse-dont-link-in-orbit2.patch: New patch.
+ * build.xml: Apply patch eclipse-dont-link-in-orbit2.patch.
+
2011-12-19 Roland Grunberg <rgrunber@redhat.com>
* jdtnonosgidependencies.properties:
diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
index fdc3281..1a686fc 100644
--- a/eclipse-build/build.xml
+++ b/eclipse-build/build.xml
@@ -340,6 +340,7 @@
<patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/eclipse-dont-link-in-orbit2.patch" dir="${buildDirectory}" strip="1" />
<echo file="patch-stamp" />
</target>
diff --git a/eclipse-build/patches/eclipse-dont-link-in-orbit2.patch b/eclipse-build/patches/eclipse-dont-link-in-orbit2.patch
new file mode 100644
index 0000000..1238911
--- /dev/null
+++ b/eclipse-build/patches/eclipse-dont-link-in-orbit2.patch
@@ -0,0 +1,17 @@
+diff -rNu eclipse-3.8.0-M1-src/plugins/org.eclipse.core.net/natives/unix/linux/makefile eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+--- eclipse-3.8.0-M1-src/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2012-01-20 10:03:33.023313778 -0500
++++ eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.core.net/natives/unix/linux/makefile 2012-01-20 10:02:20.027318769 -0500
+@@ -20,11 +20,11 @@
+
+ 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/ \
++INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ \
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+ COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
+
+-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
++LIBS := -lgconf-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+ LINKER_FLAGS= -m32
+
+ all: link
