This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, master has been updated
via f56b07e84fffef6d32dbb79531659f098aa5abcf (commit)
from d29ccfd55165d4230302158ea5d08aa6b8419698 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f56b07e84fffef6d32dbb79531659f098aa5abcf
Author: Benjamin Drung <bdr...@debian.org>
Date: Mon Sep 19 16:04:24 2011 +0200
Use pkg-config to determine CFLAGS and LIBS for gnomeproxy.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/gnomeproxy-makefile.patch | 48 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/debian/patches/gnomeproxy-makefile.patch
b/debian/patches/gnomeproxy-makefile.patch
new file mode 100644
index 0000000..ed4f25d
--- /dev/null
+++ b/debian/patches/gnomeproxy-makefile.patch
@@ -0,0 +1,48 @@
+Description: Use pkg-config to determine CFLAGS and LIBS for gnomeproxy.
+Author: Benjamin Drung <bdr...@debian.org>
+
+--- a/patches/gnomeproxy-makefile.patch
++++ b/patches/gnomeproxy-makefile.patch
+@@ -1,12 +1,35 @@
+---- a/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+-+++ b/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+-@@ -20,7 +20,8 @@
++Description: Use pkg-config to determine CFLAGS and LIBS for gnomeproxy.
++Author: Benjamin Drung <bdr...@debian.org>
++
++--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
+++++ b/eclipse/plugins/org.eclipse.core.net/natives/unix/linux/makefile
++@@ -18,12 +18,17 @@ GNOMEPROXY.O = gnomeproxy.o
++ LIB_NAME = gnomeproxy.so
++ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+
+++GCONF_CFLAGS = `pkg-config --cflags gconf-2.0`
+++GCONF_LIBS = `pkg-config --libs gconf-2.0`
+++
+++GLIB_CFLAGS = `pkg-config --cflags glib-2.0`
+++GLIB_LIBS = `pkg-config --libs glib-2.0`
+++
+ 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/orbit-2.0/
-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
++-COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
+++COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
$(GCONF_CFLAGS) $(GLIB_CFLAGS)
++
++-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
+++LIBS := $(GCONF_LIBS) $(GLIB_LIBS)
++ LINKER_FLAGS= -m32
++
++ all: link
++@@ -31,7 +36,7 @@ all: link
++ compile:
++ @echo "Building file: $(GNOMEPROXY.O)"
++ @echo "Invoking: GCC C Compiler"
++- gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O)
$(GNOMEPROXY.C)
+++ gcc $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
++ @echo "Finished building: $(GNOMEPROXY.O)"
++ @echo " "
+
+- LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
diff --git a/debian/patches/series b/debian/patches/series
index 3ed7ed6..f1daa96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ clean-source.patch
osgi-services.patch
#eclipse-build-generatedScripts.patch
debian-load-internal-swt.patch
+gnomeproxy-makefile.patch
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
