1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 21:30:52 +02:00
commit c28bcf0316
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -354,3 +354,4 @@ c7be2a78c31b3b6132f2f5e9e4b3d3bb1c20245c jdk-9+108
1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109 1787bdaabb2b6f4193406e25a50cb0419ea8e8f3 jdk-9+109
925be13b3740d07a5958ccb5ab3c0ae1baba7055 jdk-9+110 925be13b3740d07a5958ccb5ab3c0ae1baba7055 jdk-9+110
f900d5afd9c83a0df8f36161c27c5e4c86a66f4c jdk-9+111 f900d5afd9c83a0df8f36161c27c5e4c86a66f4c jdk-9+111
03543a758cd5890f2266e4b9678378a925dde22a jdk-9+112

16
common/conf/jib-profiles.js
View File

@ -241,8 +241,7 @@ var getJibProfilesProfiles = function (input, common) {
target_os: "linux", target_os: "linux",
target_cpu: "x64", target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"), dependencies: concat(common.dependencies, "devkit"),
configure_args: common.configure_args, configure_args: concat(common.configure_args, "--with-zlib=system"),
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args make_args: common.make_args
}, },
@ -251,8 +250,8 @@ var getJibProfilesProfiles = function (input, common) {
target_cpu: "x86", target_cpu: "x86",
build_cpu: "x64", build_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"), dependencies: concat(common.dependencies, "devkit"),
configure_args: concat(common.configure_args, common.configure_args_32bit), configure_args: concat(common.configure_args, common.configure_args_32bit,
configure_args: concat(common.configure_args, "--with-zlib=system"), "--with-zlib=system"),
make_args: common.make_args make_args: common.make_args
}, },
@ -260,8 +259,7 @@ var getJibProfilesProfiles = function (input, common) {
target_os: "macosx", target_os: "macosx",
target_cpu: "x64", target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit"), dependencies: concat(common.dependencies, "devkit"),
configure_args: common.configure_args, configure_args: concat(common.configure_args, "--with-zlib=system"),
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args make_args: common.make_args
}, },
@ -269,8 +267,7 @@ var getJibProfilesProfiles = function (input, common) {
target_os: "solaris", target_os: "solaris",
target_cpu: "x64", target_cpu: "x64",
dependencies: concat(common.dependencies, "devkit", "cups"), dependencies: concat(common.dependencies, "devkit", "cups"),
configure_args: common.configure_args, configure_args: concat(common.configure_args, "--with-zlib=system"),
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args make_args: common.make_args
}, },
@ -278,8 +275,7 @@ var getJibProfilesProfiles = function (input, common) {
target_os: "solaris", target_os: "solaris",
target_cpu: "sparcv9", target_cpu: "sparcv9",
dependencies: concat(common.dependencies, "devkit", "cups"), dependencies: concat(common.dependencies, "devkit", "cups"),
configure_args: common.configure_args, configure_args: concat(common.configure_args, "--with-zlib=system"),
configure_args: concat(common.configure_args, "--with-zlib=system"),
make_args: common.make_args make_args: common.make_args
}, },

1
hotspot/.hgtags
View File

@ -514,3 +514,4 @@ c5146d4da417f76edfc43097d2e2ced042a65b4e jdk-9+107
7e7e50ac4faf19899fc811569e32cfa478759ebb jdk-9+109 7e7e50ac4faf19899fc811569e32cfa478759ebb jdk-9+109
2f5d1578b24060ea06bd1f340a124db95d1475b2 jdk-9+110 2f5d1578b24060ea06bd1f340a124db95d1475b2 jdk-9+110
c558850fac5750d8ca98a45180121980f57cdd28 jdk-9+111 c558850fac5750d8ca98a45180121980f57cdd28 jdk-9+111
76582e8dc9e6374e4f99ab797c8d364b6e9449b4 jdk-9+112

5
make/common/Modules.gmk
View File

@ -252,8 +252,9 @@ endef
# * PLATFORM_MODULES # * PLATFORM_MODULES
# * JRE_TOOL_MODULES # * JRE_TOOL_MODULES
define ReadImportMetaData define ReadImportMetaData
IMPORTED_MODULES := $(call FindImportedModules) IMPORTED_MODULES := $$(call FindImportedModules)
$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadImportMetaData, $m))) $$(foreach m, $$(IMPORTED_MODULES), \
$$(eval $$(call ReadSingleImportMetaData, $$m)))
endef endef
################################################################################ ################################################################################

4
make/test/BuildTestLib.gmk
View File

@ -38,7 +38,7 @@ TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
$(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \ $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \ SETUP := GENERATE_USINGJDKBYTECODE, \
SRC := $(TEST_LIB_SOURCE_DIR)/sun, \ SRC := $(TEST_LIB_SOURCE_DIR)/sun, \
BIN := $(TEST_LIB_SUPPORT), \ BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
JAR := $(TEST_LIB_SUPPORT)/wb.jar, \ JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
ADD_JAVAC_FLAGS := $(JAVAC_WARNINGS), \ ADD_JAVAC_FLAGS := $(JAVAC_WARNINGS), \
)) ))
@ -49,7 +49,7 @@ TARGETS += $(BUILD_WB_JAR)
$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \ SETUP := GENERATE_USINGJDKBYTECODE, \
SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \ SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \
BIN := $(TEST_LIB_SUPPORT), \ BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \ JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
)) ))