Date: Thu, 30 Jul 2009 13:46:01 +0100 From: David Southwell <david@vizion2000.net> To: freebsd-ports@freebsd.org Subject: Re: Eclipse build fail Message-ID: <200907301346.01752.david@vizion2000.net> In-Reply-To: <200907301239.10922.david@vizion2000.net> References: <200907301239.10922.david@vizion2000.net>
next in thread | previous in thread | raw e-mail | index | archive | help
> Can anyone please point me in right direction:
>
> FreeBSD dns1.vizion2000.net 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #0: Wed
> Jun 24 00:14:35 UTC 2009 root@amd64-
> builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>
>
> Copying
> plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_g
>tk.properties into
> plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_freebsd
>_gtk.properties Copying plugins/org.eclipse.swt.gtk.linux.x86 into
> plugins/org.eclipse.swt.gtk.freebsd.x86
> Copying plugins/org.eclipse.swt.gtk.linux.x86 into
> plugins/org.eclipse.swt.gtk.freebsd.x86
> Copying plugins/org.eclipse.swt.gtk.linux.x86.source into
> plugins/org.eclipse.swt.gtk.freebsd.x86.source
> Copying plugins/org.eclipse.swt.gtk.linux.x86_64 into
> plugins/org.eclipse.swt.gtk.freebsd.x86_64
> Copying plugins/org.eclipse.swt.gtk.linux.x86_64.source into
> plugins/org.eclipse.swt.gtk.freebsd.x86_64.source
> Copying plugins/org.eclipse.update.core.linux into
> plugins/org.eclipse.update.core.freebsd
> Copying plugins/org.eclipse.update.core.linux/os/linux into
> plugins/org.eclipse.update.core.freebsd/os/freebsd
> Copying plugins/org.eclipse.update.core.linux.source into
> plugins/org.eclipse.update.core.freebsd.source
> Copying plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
> into plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
> Copying plugins/org.eclipse.core.net.freebsd.x86 into
> plugins/org.eclipse.core.net.freebsd.x86_64
> ===> Applying FreeBSD patches for eclipse-3.4.2
> Reversed (or previously applied) patch detected! Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesyste
>m/local/LocalFileSystem.java.rej => Patch
> patch-plugins-org.eclipse.core.filesystem-src-org-eclipse-core-
> internal-filesystem-local-LocalFileSystem.java failed to apply cleanly. =>
> Patch(es) patch-assemble.org.eclipse.sdk.all.xml patch-
> assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml patch-build patch-build.xml
> patch-features-org.eclipse.cvs-build.xml patch-features-
> org.eclipse.cvs.source-build.xml patch-features-
> org.eclipse.equinox.executable-feature.xml patch-features-
> org.eclipse.equinox.executable-library-gtk-build.sh patch-features-
> org.eclipse.equinox.executable-library-gtk-make_freebsd.mak patch-features-
> org.eclipse.equinox.executable-target.build.properties patch-features-
> org.eclipse.equinox.executable-target.build.xml patch-features-
> org.eclipse.equinox.p2.user.ui-build.xml patch-features-
> org.eclipse.equinox.p2.user.ui.source-build.xml patch-features-
> org.eclipse.help-build.xml patch-features-org.eclipse.help.source-build.xml
> patch-features-org.eclipse.jdt-build.xml patch-features-
> org.eclipse.jdt.source-build.xml patch-features-org.eclipse.pde-build.xml
> patch-features-org.eclipse.pde.p2-build.xml patch-features-
> org.eclipse.pde.p2.source-build.xml patch-features-org.eclipse.pde.source-
> build.xml patch-features-org.eclipse.platform-build.properties
> patch-features- org.eclipse.platform-build.xml
> patch-features-org.eclipse.platform-feature.xml
> patch-features-org.eclipse.platform.source-build.xml patch-features-
> org.eclipse.platform.source-feature.xml patch-features-org.eclipse.rcp-
> build.properties patch-features-org.eclipse.rcp-build.xml patch-features-
> org.eclipse.rcp-feature.xml patch-features-org.eclipse.rcp.source-build.xml
> patch-features-org.eclipse.rcp.source-feature.xml patch-features-
> org.eclipse.sdk-build.properties patch-features-org.eclipse.sdk-build.xml
> patch-package.org.eclipse.sdk.all.xml patch-plugins-org.eclipse.ant.ui-
> buildfiles-buildRemoteExtraJAR.xml
> patch-plugins-org.eclipse.core.filesystem- natives-unix-freebsd-Makefile
> patch-plugins-org.eclipse.core.filesystem-
> natives-unix-freebsd-include-os_custom.h patch-plugins-
> org.eclipse.core.filesystem-src-org-eclipse-core-internal-filesystem-local-
> LocalFileS applied cleanly.
> *** Error code 1
>
> Stop in /usr/ports/java/eclipse.
>
> Thanks in advance
I wondered whether the contents of the .rej file might be helpful:
cat LocalFileSystem.java.rej
***************
*** 98,104 ****
String arch = System.getProperty("osgi.arch", ""); //$NON-
NLS-1$ //$NON-NLS-2$
if (os.equals(Constants.OS_WIN32))
attributes |= EFS.ATTRIBUTE_ARCHIVE |
EFS.ATTRIBUTE_HIDDEN;
- else if (os.equals(Constants.OS_LINUX) ||
(os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC)))
attributes |= EFS.ATTRIBUTE_EXECUTABLE |
EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET;
else if (os.equals(Constants.OS_MACOSX) ||
os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX))
attributes |= EFS.ATTRIBUTE_EXECUTABLE;
--- 98,104 ----
String arch = System.getProperty("osgi.arch", ""); //$NON-
NLS-1$ //$NON-NLS-2$
if (os.equals(Constants.OS_WIN32))
attributes |= EFS.ATTRIBUTE_ARCHIVE |
EFS.ATTRIBUTE_HIDDEN;
+ else if (os.equals(Constants.OS_LINUX) ||
(os.equals(Constants.OS_FREEBSD)) || (os.equals(Constants.OS_SOLARIS) &&
arch.equals(Constants.ARCH_SPARC)))
attributes |= EFS.ATTRIBUTE_EXECUTABLE |
EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET;
else if (os.equals(Constants.OS_MACOSX) ||
os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX))
attributes |= EFS.ATTRIBUTE_EXECUTABLE;
dns1#
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907301346.01752.david>