diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-04-08 18:29:29 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-04-08 18:29:29 +0000 |
| commit | 84df29c2451ab4dfdffb538a9dcea85df9e5f00a (patch) | |
| tree | ca0e1ab76ff6a4e4d547901bd035a4f7ef954c1b /java | |
| parent | - Update to 0.0.20050220 (diff) | |
. When linprocfs is not mounted the Linux JDK will output a warning message,
unfortunately sending it to stdout. When using such a JDK to bootstrap
this line ends up at the head of generated classes, leaving them
uncompilable. Add a filter to the class generation to strip out such
lines with egrep.
A similar patch is present in the jdk14 port and prevents a semi-common
class of error reports.
Approved by: phantom (maintainer)
Notes
Notes:
svn path=/head/; revision=132777
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh | 17 | ||||
| -rw-r--r-- | java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh new file mode 100644 index 000000000000..fd6137cab922 --- /dev/null +++ b/java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh @@ -0,0 +1,17 @@ +$FreeBSD$ + +--- ../../j2se/make/java/nio/genCharsetProvider.sh 8 Nov 2004 22:27:03 -0000 1.1.1.1 ++++ ../../j2se/make/java/nio/genCharsetProvider.sh 24 Mar 2005 16:14:52 -0000 +@@ -94,9 +94,9 @@ + } + ' + +-$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases >>$OUT +-$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes >>$OUT +-$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes >>$OUT ++$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases | egrep -v '^Java Hotspot' >>$OUT ++$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT ++$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT + + + # Constructor diff --git a/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh b/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh new file mode 100644 index 000000000000..fd6137cab922 --- /dev/null +++ b/java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh @@ -0,0 +1,17 @@ +$FreeBSD$ + +--- ../../j2se/make/java/nio/genCharsetProvider.sh 8 Nov 2004 22:27:03 -0000 1.1.1.1 ++++ ../../j2se/make/java/nio/genCharsetProvider.sh 24 Mar 2005 16:14:52 -0000 +@@ -94,9 +94,9 @@ + } + ' + +-$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases >>$OUT +-$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes >>$OUT +-$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes >>$OUT ++$JAVA -cp $TMPDIR Hasher -i Aliases <$TMPDIR/aliases | egrep -v '^Java Hotspot' >>$OUT ++$JAVA -cp $TMPDIR Hasher -i Classes <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT ++$JAVA -cp $TMPDIR Hasher -i -e Cache -t Charset <$TMPDIR/classes | egrep -v '^Java Hotspot' >>$OUT + + + # Constructor |