-
Bug
-
Resolution: Fixed
-
P3
-
8u60, 9
-
None
-
b59
Issue | Fix Version | Assignee | Priority | Status | Resolution | Resolved In Build |
---|---|---|---|---|---|---|
JDK-8084621 | emb-9 | David Holmes | P3 | Resolved | Fixed | team |
JDK-8086832 | 8u65 | David Holmes | P3 | Resolved | Fixed | b01 |
JDK-8076144 | 8u60 | David Holmes | P3 | Resolved | Fixed | b09 |
JDK-8138040 | emb-8u65 | Unassigned | P3 | Resolved | Fixed | b01 |
JDK-8076911 | emb-8u60 | David Holmes | P3 | Resolved | Fixed | team |
Suggested fix:
diff -r 088b93bf9f01 make/copy/Copy-java.base.gmk
--- a/make/copy/Copy-java.base.gmk Sat Jan 31 02:42:15 2015 -0500
+++ b/make/copy/Copy-java.base.gmk Sat Feb 07 16:00:52 2015 -0500
@@ -85,7 +85,9 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
else
+ ALT_JVMCFG_SRC := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
+ JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
endif
JVMCFG_DIR := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR)
JVMCFG := $(JVMCFG_DIR)/jvm.cfg
Then the arm and ppc jvm.cfg files can be removed.
diff -r 088b93bf9f01 make/copy/Copy-java.base.gmk
--- a/make/copy/Copy-java.base.gmk Sat Jan 31 02:42:15 2015 -0500
+++ b/make/copy/Copy-java.base.gmk Sat Feb 07 16:00:52 2015 -0500
@@ -85,7 +85,9 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
else
+ ALT_JVMCFG_SRC := $(JDK_TOPDIR)/src/closed/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
+ JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
endif
JVMCFG_DIR := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR)
JVMCFG := $(JVMCFG_DIR)/jvm.cfg
Then the arm and ppc jvm.cfg files can be removed.
- backported by
-
JDK-8076144 move closed jvm.cfg files out of open repo
-
- Resolved
-
-
JDK-8076911 move closed jvm.cfg files out of open repo
-
- Resolved
-
-
JDK-8084621 move closed jvm.cfg files out of open repo
-
- Resolved
-
-
JDK-8086832 move closed jvm.cfg files out of open repo
-
- Resolved
-
-
JDK-8138040 move closed jvm.cfg files out of open repo
-
- Resolved
-