From owner-freebsd-ports@FreeBSD.ORG Mon Jul 26 19:37:23 2004 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E27FF16A4CE for ; Mon, 26 Jul 2004 19:37:23 +0000 (GMT) Received: from diomedes.noc.ntua.gr (diomedes.noc.ntua.gr [147.102.222.220]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F43043D39 for ; Mon, 26 Jul 2004 19:37:23 +0000 (GMT) (envelope-from past@netmode.ntua.gr) Received: from netmode.ece.ntua.gr (dolly.netmode.ece.ntua.gr [147.102.13.10]) i6QJbGjD069677; Mon, 26 Jul 2004 22:37:16 +0300 (EEST) (envelope-from past@netmode.ntua.gr) Received: from [147.102.229.10] (ppp-229-010.dialup.ntua.gr [147.102.229.10]) by netmode.ece.ntua.gr (8.12.10/8.12.8) with ESMTP id i6QJbCNC096418; Mon, 26 Jul 2004 22:37:14 +0300 (EEST) (envelope-from past@netmode.ntua.gr) Message-ID: <41055D62.30802@netmode.ntua.gr> Date: Mon, 26 Jul 2004 22:37:06 +0300 From: Panagiotis Astithas User-Agent: Mozilla Thunderbird 0.7 (X11/20040702) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Jan-Peter Koopmann References: In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Norikatsu Shigemura cc: rtdean@cytherianage.net cc: ports@freebsd.org cc: alex@freebsd.org cc: Jiawei Ye cc: freebsd-java@freebsd.org Subject: Re: HEADS UP: Eclipse 3.0 updated X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2004 19:37:24 -0000 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 @@ - + - +