changeset 6677:0bf72cc56dc3

8012147: Improve tool support Summary: Adding libjli to jdk lib dir and removing now redundant rpath entries from executables Reviewed-by: alanb, dholmes, ksrini, ahgross
author erikj
date Mon, 24 Jun 2013 10:32:19 +0200
parents ec7788ebe005
children 2cc729dda2f8
files make/common/Program.gmk make/common/Release.gmk test/Makefile
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Program.gmk	Thu Jun 20 08:51:47 2013 +0200
+++ b/make/common/Program.gmk	Mon Jun 24 10:32:19 2013 +0200
@@ -101,17 +101,14 @@
   ifeq ($(PLATFORM), solaris)
     ifeq ($(ARCH_DATA_MODEL), 32)
       LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
     else # ! ARCH_DATA_MODEL 64-bit
       LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
-      LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
     endif # ARCH_DATA_MODEL
   endif # PLATFORM SOLARIS
   ifeq ($(PLATFORM), linux)
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
-    LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
   endif # PLATFORM LINUX
 endif # PLATFORM linux solaris
 
--- a/make/common/Release.gmk	Thu Jun 20 08:51:47 2013 +0200
+++ b/make/common/Release.gmk	Mon Jun 24 10:32:19 2013 +0200
@@ -978,6 +978,11 @@
   endif
 	$(RM) -rf $(JDK_IMAGE_DIR)/jre/man
 	$(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d`
+  ifneq (,$(findstring $(PLATFORM), linux solaris)) # If linux or solaris 
+	($(CD) $(LIBDIR)/.. && $(TAR) cf - \
+	    `$(FIND) lib -name $(LIB_PREFIX)jli.$(LIB_SUFFIX) -print `) | \
+	    ($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -)
+  endif # PLATFORM
 
 initial-image-jdk64-bindemos:
 	for dir in bin demo ; do \
@@ -1026,7 +1031,7 @@
 		    initial-image-jdk-db \
 		    $(JDK_DOCFILES) \
 		    $(JDK_DEMOS_AND_SAMPLES_DOCFILES)
-	$(MKDIR) $(JDK_IMAGE_DIR)/lib
+	$(MKDIR) -p $(JDK_IMAGE_DIR)/lib
 	@#
 	@# Copy in the jars in lib that only belong in the JDK
 	@#
--- a/test/Makefile	Thu Jun 20 08:51:47 2013 +0200
+++ b/test/Makefile	Mon Jun 24 10:32:19 2013 +0200
@@ -513,7 +513,7 @@
 jdk_misc: $(call TestDirs, \
           demo/jvmti demo/zipfs javax/naming javax/script \
           javax/smartcardio javax/xml com/sun/jndi com/sun/org/glassfish \
-          com/sun/corba com/sun/xml sun/misc)
+          com/sun/corba com/sun/xml sun/misc misc)
 	$(call RunAgentvmBatch)
 
 # Stable samevm testruns (minus items from PROBLEM_LIST)