summaryrefslogtreecommitdiff
path: root/build-support/java7-openjdk/makefile-export-jar.patch
diff options
context:
space:
mode:
Diffstat (limited to 'build-support/java7-openjdk/makefile-export-jar.patch')
-rw-r--r--build-support/java7-openjdk/makefile-export-jar.patch127
1 files changed, 127 insertions, 0 deletions
diff --git a/build-support/java7-openjdk/makefile-export-jar.patch b/build-support/java7-openjdk/makefile-export-jar.patch
new file mode 100644
index 00000000..efb0bb6c
--- /dev/null
+++ b/build-support/java7-openjdk/makefile-export-jar.patch
@@ -0,0 +1,127 @@
+diff --git a/make/Makefile b/make/Makefile
+--- a/make/Makefile
++++ b/make/Makefile
+@@ -301,23 +301,18 @@
+
+ ifeq ($(JVM_VARIANT_SERVER), true)
+ MISC_DIR=$(C2_DIR)
+- GEN_DIR=$(C2_BASE_DIR)/generated
+ endif
+ ifeq ($(JVM_VARIANT_CLIENT), true)
+ MISC_DIR=$(C1_DIR)
+- GEN_DIR=$(C1_BASE_DIR)/generated
+ endif
+ ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+ MISC_DIR=$(SHARK_DIR)
+- GEN_DIR=$(SHARK_BASE_DIR)/generated
+ endif
+ ifeq ($(JVM_VARIANT_ZERO), true)
+ MISC_DIR=$(ZERO_DIR)
+- GEN_DIR=$(ZERO_BASE_DIR)/generated
+ endif
+ ifeq ($(JVM_VARIANT_MINIMAL1), true)
+ MISC_DIR=$(MINIMAL1_DIR)
+- GEN_DIR=$(MINIMAL1_BASE_DIR)/generated
+ endif
+
+ # Bin files (windows)
+@@ -377,17 +372,21 @@
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+- $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
++ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+- $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
++ $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+- $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
++ $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+- $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
++ $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
+ $(install-file)
+- $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
++ $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
+ $(install-file)
+- $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
++ $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
++ $(install-file)
++ $(EXPORT_LIB_DIR)/%.jar: $(C2_BASE_DIR)/generated/%.jar
++ $(install-file)
++ $(EXPORT_INCLUDE_DIR)/%: $(C2_BASE_DIR)/generated/jvmtifiles/%
+ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_CLIENT), true)
+@@ -397,17 +396,21 @@
+ $(install-file)
+ $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+- $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
++ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+- $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
++ $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+- $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
++ $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+- $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
++ $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
+ $(install-file)
+- $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
++ $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
+ $(install-file)
+- $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
++ $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
++ $(install-file)
++ $(EXPORT_LIB_DIR)/%.jar: $(C1_BASE_DIR)/generated/%.jar
++ $(install-file)
++ $(EXPORT_INCLUDE_DIR)/%: $(C1_BASE_DIR)/generated/jvmtifiles/%
+ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+@@ -423,6 +426,10 @@
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz
+ $(install-file)
++ $(EXPORT_LIB_DIR)/%.jar: $(SHARK_BASE_DIR)/generated/%.jar
++ $(install-file)
++ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BASE_DIR)/generated/jvmtifiles/%
++ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_ZERO), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+@@ -437,6 +444,10 @@
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
+ $(install-file)
++ $(EXPORT_LIB_DIR)/%.jar: $(ZERO_BASE_DIR)/generated/%.jar
++ $(install-file)
++ $(EXPORT_INCLUDE_DIR)/%: $(ZERO_BASE_DIR)/generated/jvmtifiles/%
++ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_MINIMAL1), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
+@@ -457,17 +468,13 @@
+ $(install-file)
+ $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz
+ $(install-file)
++ $(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_BASE_DIR)/generated/%.jar
++ $(install-file)
++ $(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_BASE_DIR)/generated/jvmtifiles/%
++ $(install-file)
+ endif
+ endif
+
+-# Jar file (sa-jdi.jar)
+-$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
+- $(install-file)
+-
+-# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
+-$(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
+- $(install-file)
+-
+ $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
+ $(install-file)
+