From owner-freebsd-java@FreeBSD.ORG Tue Aug 24 06:00:46 2004 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 145A116A4CE for ; Tue, 24 Aug 2004 06:00:46 +0000 (GMT) Received: from mail.broadpark.no (mail.broadpark.no [217.13.4.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5073343D49 for ; Tue, 24 Aug 2004 06:00:45 +0000 (GMT) (envelope-from des@des.no) Received: from dwp.des.no (37.80-203-228.nextgentel.com [80.203.228.37]) by mail.broadpark.no (Postfix) with ESMTP id 995E849BA; Tue, 24 Aug 2004 08:01:20 +0200 (MEST) Received: by dwp.des.no (Postfix, from userid 2602) id A131BB86E; Tue, 24 Aug 2004 08:00:43 +0200 (CEST) To: Panagiotis Astithas References: <4129135E.3030808@netmode.ntua.gr> <20040823080327.GA21194@netmode.ece.ntua.gr> <412A4483.3030405@netmode.ntua.gr> From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) Date: Tue, 24 Aug 2004 08:00:43 +0200 In-Reply-To: (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav's?= message of "Mon, 23 Aug 2004 23:04:00 +0200") Message-ID: User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" cc: java@FreeBSD.ORG Subject: Re: Eclipse without Mozilla X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2004 06:00:46 -0000 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable des@des.no (Dag-Erling Sm=F8rgrav) writes: > I modified the patch to trigger on WITH_MOZILLA =3D=3D firefox instead of > WITH_FIREFOX (there's plenty of precedent for the former, none for the > latter). It's building now, but I suspect it's going to take a long > time. I'll let you know when you're done. No luck yet - I had linux-sun-jdk14 installed, and eclipse will only build with a native jdk. This should be specified in the Makefile by setting JAVA_OS to "native"; see attached cumulative patch. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=eclipse-firefox.diff Index: Makefile =================================================================== RCS file: /home/pcvs/ports/java/eclipse/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 28 Jul 2004 17:56:31 -0000 1.23 +++ Makefile 24 Aug 2004 05:57:09 -0000 @@ -26,6 +26,7 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ +JAVA_OS= native USE_REINPLACE= yes NO_WRKSUBDIR= yes @@ -43,9 +44,17 @@ PLIST_SUB+= MOTIF:="" .else ECLIPSE_WS= gtk -BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla PLIST_SUB+= GTK:="" PLIST_SUB+= MOTIF:="@comment " +.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} == "firefox" +BUILD_DEPENDS+= firefox:${PORTSDIR}/www/firefox +BROWSER= firefox +BROWSER_VER= 0.9.3 +.else +BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla +BROWSER= mozilla +BROWSER_VER= +.endif .endif .if defined(WITHOUT_GNOMEVFS) @@ -58,7 +67,9 @@ PLIST_SUB+= GNOME:="" .endif -MAKE_ARGS= ECLIPSE_BUILD=${ECLIPSE_BUILD} \ +MAKE_ARGS= BROWSER=${BROWSER} \ + BROWSER_VER=${BROWSER_VER} \ + ECLIPSE_BUILD=${ECLIPSE_BUILD} \ ECLIPSE_ARCH=${ECLIPSE_ARCH} \ ECLIPSE_OS=${ECLIPSE_OS} \ ECLIPSE_WS=${ECLIPSE_WS} \ Index: files/make_gtk.mak =================================================================== RCS file: /home/pcvs/ports/java/eclipse/files/make_gtk.mak,v retrieving revision 1.2 diff -u -r1.2 make_gtk.mak --- files/make_gtk.mak 28 Jul 2004 17:56:31 -0000 1.2 +++ files/make_gtk.mak 23 Aug 2004 16:26:01 -0000 @@ -54,6 +54,7 @@ GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` +ifeq ($(BROWSER),mozilla) MOZILLACFLAGS = -O \ -fno-rtti \ -Wall \ @@ -61,14 +62,33 @@ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/bsd \ -I$(JAVA_HOME)/include/freebsd \ - -include $(MOZILLA_HOME)/include/mozilla/mozilla-config.h \ - -I$(MOZILLA_HOME)/include/mozilla \ - -I$(MOZILLA_HOME)/include/mozilla/xpcom \ - -I$(MOZILLA_HOME)/include/mozilla/string \ - -I$(MOZILLA_HOME)/include/mozilla/nspr \ - -I$(MOZILLA_HOME)/include/mozilla/embed_base \ - -I$(MOZILLA_HOME)/include/mozilla/gfx -MOZILLALIBS = -L$(MOZILLA_HOME)/lib/mozilla -lgtkembedmoz -lxpcom + -include $(MOZILLA_HOME)/include/$(BROWSER)/mozilla-config.h \ + -I$(MOZILLA_HOME)/include/$(BROWSER) \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/xpcom \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/string \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/nspr \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/embed_base \ + -I$(MOZILLA_HOME)/include/$(BROWSER)/gfx +else +MOZILLACFLAGS = -O \ + -fno-rtti \ + -Wall \ + -I./ \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/bsd \ + -I$(JAVA_HOME)/include/freebsd \ + -include $(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/mozilla-config.h \ + -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER) \ + -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/xpcom \ + -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/string \ + -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/nspr \ + -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/embed_base \ + -I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/gfx +endif + +MOZILLALIBS = -L$(MOZILLA_HOME)/lib/$(BROWSER) \ + -L$(MOZILLA_HOME)/lib/$(BROWSER)/lib/$(BROWSER)-$(BROWSER_VER) \ + -lgtkembedmoz -lxpcom MOZILLALDFLAGS = -s SWT_OBJECTS = swt.o callback.o --=-=-=--