Date: Fri, 25 Jun 2004 16:32:48 -0700 From: Doug Hockin <dhockin@staffware-spokane.com> To: freebsd-java@freebsd.org Subject: jdk1.4 on FreeBSD 5.2.1 Message-ID: <40DCB620.5050204@staffware-spokane.com>
next in thread | raw e-mail | index | archive | help
I got a patch error when attempting to port jdk1.4 to
5.2.1. I used these files:
j2sdk-1_4_2-src-scsl.zip
j2sdk-1_4_2-bin-scsl.zip
bsd-jdk14-patches-6.tar.gz
I had to change the Makefile in the port area to reference
version 6 of the patches rather than version 5. It gave
an error when attempting to checksum the patch file
(checksum missing?), so I ran the command:
make NO_CHECKSUM=yes install
The end make output looks like this:
> |Index: j2se/src/solaris/native/sun/nio/ch/NativeThread.c
> |===================================================================
> |RCS file: /var/jcvs/javasrc_1_4_scsl/j2se/src/solaris/native/sun/nio/ch/NativeThread.c,v
> |retrieving revision 1.1.1.2
> |retrieving revision 1.4
> |diff -u -r1.1.1.2 -r1.4
> |--- j2se/src/solaris/native/sun/nio/ch/NativeThread.c 22 Oct 2003 23:03:50 -0000 1.1.1.2
> |+++ j2se/src/solaris/native/sun/nio/ch/NativeThread.c 27 Oct 2003 12:16:42 -0000 1.4
> --------------------------
> Patching file j2se/src/solaris/native/sun/nio/ch/NativeThread.c using Plan A...
> Hunk #1 succeeded at 5.
> Hmm... The next patch looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |Index: j2se/src/solaris/native/sun/nio/ch/Net.c
> |===================================================================
> |RCS file: /var/jcvs/javasrc_1_4_scsl/j2se/src/solaris/native/sun/nio/ch/Net.c,v
> |retrieving revision 1.1.1.3
> |retrieving revision 1.6
> |diff -u -r1.1.1.3 -r1.6
> |--- j2se/src/solaris/native/sun/nio/ch/Net.c 22 Oct 2003 23:03:50 -0000 1.1.1.3
> |+++ j2se/src/solaris/native/sun/nio/ch/Net.c 27 Oct 2003 12:16:42 -0000 1.6
> --------------------------
> Patching file j2se/src/solaris/native/sun/nio/ch/Net.c using Plan A...
> Hunk #1 succeeded at 283.
> done
> ===> Applying FreeBSD patches for jdk-1.4.2p6
> 1 out of 1 hunks failed--saving rejects to ../../j2se/src/solaris/native/java/net/PlainDatagramSocketImpl.c.rej
>>> Patch patch-PlainDatagramSocketImpl.c failed to apply cleanly.
> *** Error code 1
>
> Stop in /usr/ports/java/jdk14.
>
> Compilation exited abnormally with code 1 at Fri Jun 25 15:23:43
And the .rej file looks like this:
> ***************
> *** 2034,2042 ****
> /*
> * Join the multicast group.
> */
> - // XXXBSD: fix for BSD (re-implement with KAME ?)
> - // if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP),
> - if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? 1 : 0),
> (char *) &mname, mname_len) < 0) {
>
> /*
> --- 2034,2040 ----
> /*
> * Join the multicast group.
> */
> + if (JVM_SetSockOpt(fd, IPPROTO_IP, (join ? IP_ADD_MEMBERSHIP:IP_DROP_MEMBERSHIP),
> (char *) &mname, mname_len) < 0) {
>
> /*
-- Doug
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?40DCB620.5050204>