summaryrefslogtreecommitdiff
path: root/debian/patches/default-jvm-cfg-default.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2017-05-12 22:48:36 +0300
committerIgor Pashev <pashev.igor@gmail.com>2017-05-12 22:48:36 +0300
commit37d630875d33bf3c291026c40bb08d1b6c9edcc8 (patch)
tree68fb026f54a962cf1d631f010e98681add6ed014 /debian/patches/default-jvm-cfg-default.diff
downloadopenjdk-8-37d630875d33bf3c291026c40bb08d1b6c9edcc8.tar.gz
Imported debian/openjdk-8_8u131-b11-1debian/8u131-b11-1debian
Diffstat (limited to 'debian/patches/default-jvm-cfg-default.diff')
-rw-r--r--debian/patches/default-jvm-cfg-default.diff22
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/default-jvm-cfg-default.diff b/debian/patches/default-jvm-cfg-default.diff
new file mode 100644
index 0000000..e215ccd
--- /dev/null
+++ b/debian/patches/default-jvm-cfg-default.diff
@@ -0,0 +1,22 @@
+--- a/jdk/src/share/bin/java.c
++++ b/jdk/src/share/bin/java.c
+@@ -1699,7 +1699,7 @@ jint
+ ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
+ {
+ FILE *jvmCfg;
+- char line[MAXPATHLEN+20];
++ char line[MAXPATHLEN+30];
+ int cnt = 0;
+ int lineno = 0;
+ jlong start, end;
+@@ -1714,6 +1714,10 @@ ReadKnownVMs(const char *jvmCfgName, jbo
+
+ jvmCfg = fopen(jvmCfgName, "r");
+ if (jvmCfg == NULL) {
++ strcat(jvmCfgName, "-default");
++ jvmCfg = fopen(jvmCfgName, "r");
++ }
++ if (jvmCfg == NULL) {
+ if (!speculative) {
+ JLI_ReportErrorMessage(CFG_ERROR6, jvmCfgName);
+ exit(1);