Revert D17935286: Update GCC for centos CI builds

smessmer · facebook-github-bot · commit e4f5224ebde7 · 2019-10-15T17:51:08.000-07:00
Test Plan: revert-hammer

Differential Revision:
D17935286

Original commit changeset: 12f584d4a240

fbshipit-source-id: ecc49bbf1d6f78752bdb834b8a1b145a359c8240
diff --git a/.jenkins/caffe2/build.sh b/.jenkins/caffe2/build.sh
@@ -4,14 +4,12 @@ set -ex
 
 source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
 
-if [[ "$BUILD_ENVIRONMENT" == *centos7* ]]; then
-  # CentOS has gcc 4 but we need a newer compiler. Upgrade it.
-  sudo yum install -y centos-release-scl
-  sudo yum install -y devtoolset-7\*
-  sudo yum install -y scl-utils
-
-  source scl_source enable devtoolset-7
-  gcc --version
+# TODO: Migrate all centos jobs to use proper devtoolset
+if [[ "$BUILD_ENVIRONMENT" == *py2-cuda9.0-cudnn7-centos7* ]]; then
+  # There is a bug in pango packge on Centos7 that causes undefined
+  # symbols, upgrading glib2 to >=2.56.1 solves the issue. See
+  # https://bugs.centos.org/view.php?id=15495
+  sudo yum install -y -q glib2-2.56.1
 fi
 
 # CMAKE_ARGS are only passed to 'cmake' and the -Dfoo=bar does not work with
