Date: Mon, 26 Jul 2004 22:37:06 +0300 From: Panagiotis Astithas <past@netmode.ntua.gr> To: Jan-Peter Koopmann <Jan-Peter.Koopmann@seceidos.de> Cc: freebsd-java@freebsd.org Subject: Re: HEADS UP: Eclipse 3.0 updated Message-ID: <41055D62.30802@netmode.ntua.gr> In-Reply-To: <AEF86EFA5497434190F6D57E2666EA7AD577@ERWIN.intern.seceidos.de> References: <AEF86EFA5497434190F6D57E2666EA7AD577@ERWIN.intern.seceidos.de>
next in thread | previous in thread | raw e-mail | index | archive | help
Jan-Peter Koopmann wrote:
> On Monday, July 26, 2004 10:27 AM Panagiotis Astithas wrote:
>
>
>
>>This was reported a few days ago from Jan-Peter Koopmann
>>(CC'ed). I had suggested the following crude patch, that
>>seemed to compile for him, but
>> haven't heard ever since whether ir really worked.
>
>
> Uups... I am sure I sent a message but hell... Too much stress. It worked out ok and eclipse compiled without any further problems! Thanks!
>
> Regards,
> JP
Great, I think the following patch should be appropriate then. If
someone could test it I'd be grateful (especially on 4.x), since my
system keeps locking hard today :-(
diff -ruN /usr/ports/java/eclipse/files/Makefile eclipse/files/Makefile
--- /usr/ports/java/eclipse/files/Makefile Mon Jul 26 13:59:03 2004
+++ eclipse/files/Makefile Mon Jul 26 20:19:18 2004
@@ -56,7 +56,7 @@
libupdate:
@$(ECHO) "===> Building libupdate."
cd plugins/org.eclipse.update.core.freebsd/src && \
- $(ANT) -Djava.home=$(JAVA_HOME)
+ $(ANT) -Djava.home=$(JAVA_HOME) -DCC=$(CC)
@$(ECHO) "===> Building libcore."
cd plugins/org.eclipse.core.resources.freebsd/src && \
env JDK_INCLUDE="/usr/local/jdk1.4.2/include
-I/usr/local/jdk1.4.2/include/freebsd" $(GMAKE) && \
diff -ruN /usr/ports/java/eclipse/files/make_freebsd.mak
eclipse/files/make_freebsd.mak
--- /usr/ports/java/eclipse/files/make_freebsd.mak Sun Jul 25
11:01:08 2004+++ eclipse/files/make_freebsd.mak Wed Jul 21 12:56:32
2004
@@ -84,16 +84,16 @@
make_gnome: $(GNOME_LIB)
$(GNOME_LIB): $(GNOME_OBJECTS)
- gcc -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
+ $(CC) -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS)
gnome.o: gnome.c
- gcc -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd
-I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome.o gnome.c
+ $(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd
-I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome.o gnome.c
gnome_structs.o: gnome_structs.c
- gcc -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd
-I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_structs.o
gnome_structs.c
+ $(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd
-I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_structs.o
gnome_structs.c
gnome_stats.o: gnome_stats.c
- gcc -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd
-I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_stats.o
gnome_stats.c
+ $(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd
-I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_stats.o
gnome_stats.c
make_kde: $(KDE_LIB)
@@ -101,7 +101,7 @@
ld -o $@ $(KDE_OBJS) $(KDE_LIBS)
$(KDE_OBJS): kde.cc
- g++ $(KDE_CFLAGS) -o kde.o kde.cc
+ $(CXX) $(KDE_CFLAGS) -o kde.o kde.cc
make_awt: $(AWT_LIB)
diff -ruN /usr/ports/java/eclipse/files/make_gtk.mak
eclipse/files/make_gtk.mak
--- /usr/ports/java/eclipse/files/make_gtk.mak Sun Jul 25 11:01:08 2004
+++ eclipse/files/make_gtk.mak Mon Jul 26 22:23:51 2004
@@ -13,8 +13,7 @@
include make_common.mak
-CC=gcc
-LD=gcc
+LD=$(CC)
SWT_VERSION=$(maj_ver)$(min_ver)
diff -ruN /usr/ports/java/eclipse/files/update-build.xml
eclipse/files/update-build.xml
--- /usr/ports/java/eclipse/files/update-build.xml Sun Jul 25
11:01:08 2004+++ eclipse/files/update-build.xml Mon Jul 26 20:02:57
2004
@@ -47,9 +47,9 @@
<property name="header-path" value="${jdk-path}/include"/>
<property name="header-freebsd-path" value="${header-path}/freebsd" />
- <echo message="gcc33 -o ${library-file} -shared -I${src-path}
-I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/>
+ <echo message="${CC} -o ${library-file} -shared -I${src-path}
-I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/>
- <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
+ <apply executable="${CC}" dest="${eclipse-home}/" parallel="false">
<arg value="-o"/>
<arg value="${library-file}"/>
<arg value="-shared"/>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41055D62.30802>