Mercurial > hg > openjdk > bsd-port > hotspot
changeset 5930:14d0f4da4a74 jdk7u111-b00
8079410: Hotspot version to share the same update and build version from JDK
Reviewed-by: dholmes, dcubed
author | amurillo |
---|---|
date | Fri, 15 Jul 2016 17:05:18 +0100 |
parents | 165b97219811 |
children | 9efa3fae3c27 |
files | make/defs.make make/hotspot_version |
diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/defs.make Fri Jul 15 06:04:31 2016 +0100 +++ b/make/defs.make Fri Jul 15 17:05:18 2016 +0100 @@ -101,6 +101,18 @@ # hotspot version definitions include $(GAMMADIR)/make/hotspot_version +# When config parameter JDK_UPDATE_VERSION is defined, +# Hotspot minor version should be set to that +ifneq ($(JDK_UPDATE_VERSION),) + HS_MINOR_VER=$(JDK_UPDATE_VERSION) +endif + +# When config parameter JDK_BUILD_NUMBER is defined, +# Hotspot build number should be set to that +ifneq ($(JDK_BUILD_NUMBER),) + HS_BUILD_NUMBER=$(subst b,,$(JDK_BUILD_NUMBER)) +endif + # Java versions needed ifeq ($(PREVIOUS_JDK_VERSION),) PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION)