. 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)
This commit is contained in:
Greg Lewis 2005-04-08 18:29:29 +00:00
parent ecc25b75c7
commit 84df29c245
2 changed files with 34 additions and 0 deletions

View file

@ -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

View file

@ -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