aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2005-04-09 02:29:29 +0800
committerglewis <glewis@FreeBSD.org>2005-04-09 02:29:29 +0800
commiteacfc91767cee8965819b08f756f63aa3272f564 (patch)
treeb2a3465fe05139c4d9f1dfd60bc26a0ae9706011 /java
parentfb8c94d78faa94a52e3da15f295191aa88ede376 (diff)
downloadfreebsd-ports-graphics-eacfc91767cee8965819b08f756f63aa3272f564.tar.gz
freebsd-ports-graphics-eacfc91767cee8965819b08f756f63aa3272f564.tar.zst
freebsd-ports-graphics-eacfc91767cee8965819b08f756f63aa3272f564.zip
. 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)
Diffstat (limited to 'java')
-rw-r--r--java/jdk15/files/patch-j2se::nio::genCharsetProvider.sh17
-rw-r--r--java/jdk16/files/patch-j2se::nio::genCharsetProvider.sh17
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 00000000000..fd6137cab92
--- /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 00000000000..fd6137cab92
--- /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