rdelval closed pull request #44: Change devtoolset-7 (scl-rh) of CentOS6
URL: https://github.com/apache/aurora/pull/44
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build-support/python/make-mesos-native-egg
b/build-support/python/make-mesos-native-egg
index 11bd0aea7..3f076c18f 100755
--- a/build-support/python/make-mesos-native-egg
+++ b/build-support/python/make-mesos-native-egg
@@ -139,15 +139,18 @@ CENTOS6_X86_64_DEPENDENCIES=(
apr-devel
cyrus-sasl-devel
cyrus-sasl-md5
- devtoolset-2-binutils
- devtoolset-2-gcc
- devtoolset-2-gcc-c++
+ devtoolset-7-binutils
+ devtoolset-7-gcc
+ devtoolset-7-gcc-c++
+ devtoolset-7-toolchain
libcurl-devel
make
patch
python27-python-devel
subversion-devel
zlib-devel
+ wget
+ tar
)
build_centos6() {
local mesos_version=$1 output_basedir=$2
@@ -160,17 +163,11 @@ build_centos6() {
# We need Software Collections for Python 2.7 (we dropped support for 2.6).
# wget must get installed before everything else to fetch the additional
repos.
- yum -y install centos-release-SCL wget
-
- # Mesos requires gcc 4.8, which is available in devtools-2 on centos 6.
- # TODO(maxim): Consider using signed packages when/if available.
- wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O
/etc/yum.repos.d/devtools-2.repo
-
+ yum -y install centos-release-scl-rh
yum -y install ${CENTOS6_X86_64_DEPENDENCIES[*]}
- export CC=/opt/rh/devtoolset-2/root/usr/bin/gcc
- export CPP=/opt/rh/devtoolset-2/root/usr/bin/cpp
- export CXX=/opt/rh/devtoolset-2/root/usr/bin/c++
- scl enable devtoolset-2 bash
+
+ # Mesos requires gcc 4.8+, which is available in devtools-7 on centos 6.
+ scl enable devtoolset-7 bash
scl enable python27 - <<EOS
$(fetch_and_build_mesos "$mesos_version")
EOS
@@ -192,6 +189,7 @@ CENTOS7_X86_64_DEPENDENCIES=(
subversion-devel
wget
zlib-devel
+ tar
)
build_centos7() {
local mesos_version=$1 output_basedir=$2
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
