From 30f8dd376675903885e3d4824675638946ef487b Mon Sep 17 00:00:00 2001 From: glewis Date: Fri, 17 Dec 2004 07:08:59 +0000 Subject: . Avoid a problem where, without linprocfs mounted, the first line of a generated file will be overwritten with a warning, causing the build to fail. There is a check for linprocfs in pre-build, but it seems as though this problem can somehow trigger anyway, based on semi-regular reports to the mailing lists. PR: 74999 Approved by: phantom --- java/jdk14/files/patch-java_Makefile | 11 +++++++++++ java/jdk15/files/patch-java_Makefile | 11 +++++++++++ java/jdk16/files/patch-java_Makefile | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 java/jdk14/files/patch-java_Makefile create mode 100644 java/jdk15/files/patch-java_Makefile create mode 100644 java/jdk16/files/patch-java_Makefile (limited to 'java') diff --git a/java/jdk14/files/patch-java_Makefile b/java/jdk14/files/patch-java_Makefile new file mode 100644 index 000000000000..60585c522db4 --- /dev/null +++ b/java/jdk14/files/patch-java_Makefile @@ -0,0 +1,11 @@ +--- ../../j2se/make/java/java/Makefile.orig Mon Dec 13 12:38:14 2004 ++++ ../../j2se/make/java/java/Makefile Mon Dec 13 12:42:00 2004 +@@ -284,7 +284,7 @@ + $(RM) -r $(TMPDIR)/GenerateCurrencyData + $(MKDIR) -p $(TMPDIR)/GenerateCurrencyData + $(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java +- $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ ++ $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ + + clean:: + $(RM) $(GENSRCDIR)/java/util/CurrencyData.java diff --git a/java/jdk15/files/patch-java_Makefile b/java/jdk15/files/patch-java_Makefile new file mode 100644 index 000000000000..60585c522db4 --- /dev/null +++ b/java/jdk15/files/patch-java_Makefile @@ -0,0 +1,11 @@ +--- ../../j2se/make/java/java/Makefile.orig Mon Dec 13 12:38:14 2004 ++++ ../../j2se/make/java/java/Makefile Mon Dec 13 12:42:00 2004 +@@ -284,7 +284,7 @@ + $(RM) -r $(TMPDIR)/GenerateCurrencyData + $(MKDIR) -p $(TMPDIR)/GenerateCurrencyData + $(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java +- $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ ++ $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ + + clean:: + $(RM) $(GENSRCDIR)/java/util/CurrencyData.java diff --git a/java/jdk16/files/patch-java_Makefile b/java/jdk16/files/patch-java_Makefile new file mode 100644 index 000000000000..60585c522db4 --- /dev/null +++ b/java/jdk16/files/patch-java_Makefile @@ -0,0 +1,11 @@ +--- ../../j2se/make/java/java/Makefile.orig Mon Dec 13 12:38:14 2004 ++++ ../../j2se/make/java/java/Makefile Mon Dec 13 12:42:00 2004 +@@ -284,7 +284,7 @@ + $(RM) -r $(TMPDIR)/GenerateCurrencyData + $(MKDIR) -p $(TMPDIR)/GenerateCurrencyData + $(JAVAC_BOOT) -d $(TMPDIR)/GenerateCurrencyData $(BUILDDIR)/tools/GenerateCurrencyData/GenerateCurrencyData.java +- $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties > $@ ++ $(JAVA_BOOT) -classpath $(TMPDIR)/GenerateCurrencyData GenerateCurrencyData < $(SHARE_SRC)/classes/java/util/CurrencyData.properties | egrep -v '^Java HotSpot' > $@ + + clean:: + $(RM) $(GENSRCDIR)/java/util/CurrencyData.java -- cgit