RFR: JDK-8059019 sdp.conf.template should move from unix to solaris

Magnus Ihse Bursie magnus.ihse.bursie at oracle.com
Wed Sep 5 12:58:06 UTC 2018


The file sdp.conf.template is copied only when building for solaris, but 
it resides in the unix source directory.

Bug: https://bugs.openjdk.java.net/browse/JDK-8059019
Patch inline:
diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk
--- a/make/copy/Copy-java.base.gmk
+++ b/make/copy/Copy-java.base.gmk
@@ -185,7 +185,7 @@

  ifeq ($(OPENJDK_TARGET_OS), solaris)
    $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
-      FILES := 
$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, 
\
+      FILES := 
$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf/sdp/sdp.conf.template, \
        DEST := $(CONF_DST_DIR)/sdp, \
    ))

diff --git a/src/java.base/unix/conf/sdp/sdp.conf.template 
b/src/java.base/solaris/conf/sdp/sdp.conf.template
rename from src/java.base/unix/conf/sdp/sdp.conf.template
rename to src/java.base/solaris/conf/sdp/sdp.conf.template

/Magnus



More information about the build-dev mailing list