From bca2a31c0a91b22bc86f07fe8fdefc04d1ee93a5 Mon Sep 17 00:00:00 2001 From: erikj Date: Mon, 23 Oct 2017 10:39:11 +0200 Subject: [PATCH] 8189119: Devkit for Linux needs to include fontconfig-devel Reviewed-by: ihse --- make/conf/jib-profiles.js | 2 +- make/devkit/Tools.gmk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index b8362b568d..80996de218 100644 --- 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 index b7d7855248..b259f9e77a 100644 --- 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)