[openjdk-8] 01/01: Refreshed default-jvm-cfg-default.diff

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit e9d4a27f05d26a4e5744ceac3dd6d53d0b5ac74b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 1 01:31:32 2014 +0200

    Refreshed default-jvm-cfg-default.diff
---
 debian/patches/default-jvm-cfg-default.diff | 30 ++++-------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/patches/default-jvm-cfg-default.diff b/debian/patches/default-jvm-cfg-default.diff
index 1e9a4a7..6d02bc0 100644
--- a/debian/patches/default-jvm-cfg-default.diff
+++ b/debian/patches/default-jvm-cfg-default.diff
@@ -1,6 +1,6 @@
---- openjdk/jdk/src/share/bin/java.c.orig
-+++ openjdk/jdk/src/share/bin/java.c
-@@ -1580,7 +1580,7 @@
+--- a/jdk/src/share/bin/java.c
++++ b/jdk/src/share/bin/java.c
+@@ -1623,7 +1623,7 @@
  ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
  {
      FILE *jvmCfg;
@@ -9,7 +9,7 @@
      int cnt = 0;
      int lineno = 0;
      jlong start, end;
-@@ -1595,6 +1595,10 @@
+@@ -1638,6 +1638,10 @@
  
      jvmCfg = fopen(jvmCfgName, "r");
      if (jvmCfg == NULL) {
@@ -20,25 +20,3 @@
        if (!speculative) {
          JLI_ReportErrorMessage(CFG_ERROR6, jvmCfgName);
          exit(1);
---- openjdk/hotspot/src/share/tools/launcher/java.c.orig
-+++ openjdk/hotspot/src/share/tools/launcher/java.c
-@@ -1863,7 +1863,7 @@
- ReadKnownVMs(const char *jrepath, char * arch, jboolean speculative)
- {
-     FILE *jvmCfg;
--    char jvmCfgName[MAXPATHLEN+20];
-+    char jvmCfgName[MAXPATHLEN+30];
-     char line[MAXPATHLEN+20];
-     int cnt = 0;
-     int lineno = 0;
-@@ -1884,6 +1884,10 @@
- 
-     jvmCfg = fopen(jvmCfgName, "r");
-     if (jvmCfg == NULL) {
-+      strcat(jvmCfgName, "-default");
-+      jvmCfg = fopen(jvmCfgName, "r");
-+    }
-+    if (jvmCfg == NULL) {
-       if (!speculative) {
-         ReportErrorMessage2("Error: could not open `%s'", jvmCfgName,
-                             JNI_TRUE);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git