--- a/.hgtags	Mon Apr 22 17:30:15 2019 +0100
+++ b/.hgtags	Fri May 24 04:01:18 2019 +0100
@@ -1007,6 +1007,7 @@
 a8b6e38ee409be0fb8fc931a4762f9d04f2f2da0 jdk8u202-b26
 0ea872ce75502739f90bacf092d471889673c757 jdk8u202-ga
 3a2209a0e9c9192bc803a95fa72510a79847bf15 jdk8u212-b00
+5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u222-b00
 5af73acc6b6c7097ce916c860fd85c45459ea19a jdk8u212-b01
 7480582c7fdcfc86b5541a1887289a8416ef7f7d jdk8u212-b02
 5218ef8ea6c355b5f3294a21675dfb6d372c02f4 jdk8u212-b03

--- a/common/autoconf/spec.gmk.in	Mon Apr 22 17:30:15 2019 +0100
+++ b/common/autoconf/spec.gmk.in	Fri May 24 04:01:18 2019 +0100
@@ -308,6 +308,7 @@
 FREETYPE_LIBS:=@FREETYPE_LIBS@
 FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
 FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
+FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@
 CUPS_CFLAGS:=@CUPS_CFLAGS@
 ALSA_LIBS:=@ALSA_LIBS@
 ALSA_CFLAGS:=@ALSA_CFLAGS@

--- a/make/Main.gmk	Mon Apr 22 17:30:15 2019 +0100
+++ b/make/Main.gmk	Fri May 24 04:01:18 2019 +0100
@@ -238,7 +238,7 @@
         else
 	  @$(ECHO) "Re-running configure using default settings"
         endif
-	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure "$(CONFIGURE_COMMAND_LINE)" )
+	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
 .PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
 .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only

--- a/make/common/MakeBase.gmk	Mon Apr 22 17:30:15 2019 +0100
+++ b/make/common/MakeBase.gmk	Fri May 24 04:01:18 2019 +0100
@@ -293,8 +293,8 @@
 
 endef
 
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
+# The source ids can come from the Mercurial repository, or in the files
+# $(HGTIP_FILENAME) which contains the id but is also positioned in the same
 # directory as the original $(HGDIR) directory.
 # These should not be := assignments, only used from the root Makefile.
 HG_VERSION = $(shell $(HG) version 2> /dev/null)
@@ -306,7 +306,7 @@
         $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
         2> /dev/null)))))
 
-# Emit the repo:tip pairs to $@
+# Emit the repo:id pairs to $@
 define GetSourceTips
 	$(CD) $(SRC_ROOT) ; \
 	for i in $(REPO_LIST) IGNORE ; do \
@@ -314,7 +314,7 @@
 	    continue; \
 	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
 	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
+	        "$${i}" `$(HG) id -i --repository $${i}` ; \
 	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
 	    $(PRINTF) " %s:%s" \
 	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
@@ -325,7 +325,7 @@
 
 # Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
 define CreateHgTip
-	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
+	$(HG) id -i --repository $1' > $1/$(HGTIP_FILENAME); \
 	$(ECHO) $1/$(HGTIP_FILENAME)
 endef