diff options
| author | glewis <glewis@FreeBSD.org> | 2004-12-17 15:08:59 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2004-12-17 15:08:59 +0800 |
| commit | 30f8dd376675903885e3d4824675638946ef487b (patch) | |
| tree | fbab19a07987f61792874a94c0e7a39282d42b19 /java | |
| parent | f03de6b42bbb33e6d198e4e13986fcefe725dbe2 (diff) | |
| download | freebsd-ports-gnome-30f8dd376675903885e3d4824675638946ef487b.tar.gz freebsd-ports-gnome-30f8dd376675903885e3d4824675638946ef487b.tar.zst freebsd-ports-gnome-30f8dd376675903885e3d4824675638946ef487b.zip | |
. 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
Diffstat (limited to 'java')
| -rw-r--r-- | java/jdk14/files/patch-java_Makefile | 11 | ||||
| -rw-r--r-- | java/jdk15/files/patch-java_Makefile | 11 | ||||
| -rw-r--r-- | java/jdk16/files/patch-java_Makefile | 11 |
3 files changed, 33 insertions, 0 deletions
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 |