8189119: Devkit for Linux needs to include fontconfig-devel

Reviewed-by: ihse
JasonFengJ9 · Oct 23, 2017 · bca2a31 · bca2a31
1 parent 373e208
commit bca2a31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
@@ -998,7 +998,7 @@ var getJibProfilesProfiles = function (input, common, data) {
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc4.9.2-OEL6.4+1.1",
+        linux_x64: "gcc4.9.2-OEL6.4+1.2",
         macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u4-Solaris11u1+1.0",

diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
@@ -84,7 +84,8 @@ RPM_LIST := \
     libXau libXau-devel \
     libgcc \
     zlib zlib-devel \
-    libffi libffi-devel
+    libffi libffi-devel \
+    fontconfig fontconfig-devel
 
 ifeq ($(ARCH),x86_64)
   RPM_DIR ?= $(RPM_DIR_x86_64)