cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bootstrap Java instead of newly built binary to execute RMIC.

Browse Source
This commit is contained in:
Jung-uk Kim 2013-05-15 00:17:57 +00:00
parent e975f43466
commit edb186c0b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=318210
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java/openjdk6/files/patch-set
View File

@ -8877,6 +8877,26 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
--- jdk/make/com/sun/jmx/Makefile
+++ jdk/make/com/sun/jmx/Makefile
@@ -102,16 +102,7 @@
# when available, we need to run with latest rmic version available. rmic
# launch tool not built at this stage but we can invoke via rmi class.
-RMIC_JAVA = $(OUTPUTDIR)/bin/java
-# need to treat 64bit solaris differently
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
-endif
-ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
-RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/java
-endif
-
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC = $(BOOT_JAVA_CMD) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
$(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
$(prep-target)
--- jdk/make/com/sun/security/auth/module/Makefile
+++ jdk/make/com/sun/security/auth/module/Makefile
@@ -70,7 +70,7 @@