Date: Tue, 10 Jan 2006 09:56:28 +0200 From: Panagiotis Astithas <past@ebs.gr> To: Sean McNeil <sean@mcneil.com> Cc: freebsd-eclipse@freebsd.org Subject: Re: eclipse-cdt on amd64 Message-ID: <43C368AC.5020007@ebs.gr> In-Reply-To: <1136834432.8418.2.camel@triton.mcneil.com> References: <1136703725.30638.1.camel@triton.mcneil.com> <43C22E30.7000705@ebs.gr> <1136834432.8418.2.camel@triton.mcneil.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------020603030708080204050306 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sean McNeil wrote: > On Mon, 2006-01-09 at 11:34 +0200, Panagiotis Astithas wrote: > >>Sean McNeil wrote: >> >>>Can someone please fix this port? It worked fine until a recent update: >>> >>>=> eclipse/org.eclipse.cdt.sdk-3.0.1-linux.amd64.tar.gz is not >>>in /usr/ports/java/eclipse-cdt/distinfo. >>>=> Either /usr/ports/java/eclipse-cdt/distinfo is out of date, or >>>=> eclipse/org.eclipse.cdt.sdk-3.0.1-linux.amd64.tar.gz is spelled >>>incorrectly. >>>*** Error code 1 >>> >>>Stop in /usr/ports/java/eclipse-cdt. >> >>Sorry, this is my fault. Unfortunately, the proper fix would be to port >>the native library patches to amd64, but lacking the proper hardware I >>am unable to do it myself. However, perhaps the attached patch could >>make things functional again, at least as they were before. Can you try >>it and let me know how it goes? > > > Yes, that got me back on track. Interesting that I haven't hit the > issues related to x86 vs. amd64 yet, but I haven't stressed things that > much. > > Too bad you do not have any amd64 hardware. It would be real nice to > have your support on this platform. OK, can you try this patch too, please? It is supposed to DTRT when uninstalling eclipse-cdt for both platforms, unlike the previous one I sent you. I'd like you to try both a 'make install' and 'make deinstall' and let me know if there are any warnings. You should definitely get a warning when uninstalling the version from my previous patch, but It should be fixed now. Thanks, Panagiotis --------------020603030708080204050306 Content-Type: text/x-patch; name="eclipse-cdt.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="eclipse-cdt.patch" diff -ruN /usr/ports/java/eclipse-cdt/Makefile eclipse-cdt/Makefile --- /usr/ports/java/eclipse-cdt/Makefile Tue Jan 3 05:26:38 2006 +++ eclipse-cdt/Makefile Tue Jan 10 09:45:09 2006 @@ -10,7 +10,7 @@ CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/tools/cdt/releases/eclipse3.1/dist/${PORTVERSION}/ PKGNAMEPREFIX= eclipse- -DISTNAME= org.eclipse.cdt.sdk-${PORTVERSION}-linux.${ECLIPSE_ARCH} +DISTNAME= org.eclipse.cdt.sdk-${PORTVERSION}-linux.x86 DIST_SUBDIR= eclipse MAINTAINER= freebsd-eclipse@FreeBSD.org @@ -31,6 +31,8 @@ ECLIPSE_ARCH= amd64 .else ECLIPSE_ARCH= x86 +PLIST_FILES+= eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/os/freebsd/x86/libpty.so \ + eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/os/freebsd/x86/libspawner.so .endif MAKE_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ @@ -44,8 +46,10 @@ @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core.freebsd_${PORTVERSION}/*.orig @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.core_${PORTVERSION}/*.orig @${RM} ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.managedbuilder.gnu.ui_${PORTVERSION}/*.orig +.if (${ARCH} == "i386") @(cd ${WRKSRC}/eclipse/plugins/org.eclipse.cdt.source.freebsd.gtk.x86_${PORTVERSION}/src/org.eclipse.cdt.core.freebsd_${PORTVERSION}/library; \ ${SETENV} ${MAKE_ENV} ${GMAKE}) +.endif do-install: @${MKDIR} ${PREFIX}/eclipse diff -ruN /usr/ports/java/eclipse-cdt/pkg-plist eclipse-cdt/pkg-plist --- /usr/ports/java/eclipse-cdt/pkg-plist Tue Jan 3 05:28:05 2006 +++ eclipse-cdt/pkg-plist Tue Jan 10 09:44:27 2006 @@ -531,8 +531,6 @@ eclipse/plugins/org.eclipse.cdt.core_3.0.1/plugin.properties eclipse/plugins/org.eclipse.cdt.core_3.0.1/about.html eclipse/plugins/org.eclipse.cdt.core_3.0.1/plugin.xml -eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/os/freebsd/x86/libspawner.so -eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/os/freebsd/x86/libpty.so eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/about.html eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/fragment.xml eclipse/plugins/org.eclipse.cdt.core.freebsd_3.0.1/cdt_linux.jar --------------020603030708080204050306--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?43C368AC.5020007>