Date: Wed, 08 Oct 2003 20:27:07 -0700 From: Andrew Houghton <aah@acm.org> To: Greg Lewis <glewis@eyesbeyond.com> Cc: freebsd-java@freebsd.org Subject: Re: jdk14 patches Message-ID: <3F84D58B.1010205@acm.org> In-Reply-To: <20031009005113.GA50130@misty.eyesbeyond.com> References: <20031009005113.GA50130@misty.eyesbeyond.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Thank you, thank you. The diff you provided applies cleanly, but breaks the application of files/patch-FileChannelImpl.c ===> Ignoring patchfile /usr/ports/java/jdk14/files/patch-DefaultSelectorProvider.java.orig 1 out of 1 hunks failed--saving rejects to ../../j2se/src/solaris/native/sun/nio/ch/FileChannelImpl.c.rej >> Patch patch-FileChannelImpl.c failed to apply cleanly. >> Patch(es) patch-DefaultSelectorProvider.java applied cleanly. *** Error code 1 My process up to this point: cd /usr/ports/java/jdk14 make clean patch -p0 < jdk14.diff make build It looks like the version in your patches should simply replace the version in files/patch-FileChannelImpl.c; after removing the spurious $FreeBSD$ at the top of the file and getting rid of the old patch, everything applied cleanly. Building now. - a. Greg Lewis wrote: >Hi all, > >Attached is a set of patches for the jdk14 port. These should fix a number >of well known bugs, including getting things compiling on -CURRENT. > >Assuming: >1) Someone confirms these do actually get things compiling on -CURRENT. >2) Patchset 4 doesn't come out (*). >3) They get a positive review from Alexey (or no response). > >Then I'll commit the patches in a weeks time. > >If not, then hopefully collecting them together like this will at least >help some people. I am currently running these changes at work, FWIW. > >Alexey, please take a look at these. The changes to the Makefile and >installation of preferences files are independent of patchset 4. > >* I don't know when patchset 4 is coming out. Please direct questions > about this to Alexey. > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F84D58B.1010205>