diff --git a/docker/build_scripts/build.sh b/docker/build_scripts/build.sh index bf7b16c..5476518 100644 --- a/docker/build_scripts/build.sh +++ b/docker/build_scripts/build.sh @@ -5,12 +5,12 @@ set -ex # Python versions to be installed in /opt/$VERSION_NO -CPYTHON_VERSIONS="2.6.9 2.7.11 3.3.6 3.4.4 3.5.1" +CPYTHON_VERSIONS="2.6.9 2.7.11 3.3.6 3.4.4 3.5.1 3.6.0b2" # openssl version to build, with expected sha256 hash of .tar.gz # archive -OPENSSL_ROOT=openssl-1.0.2h -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_ROOT=openssl-1.0.2j +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 EPEL_RPM_HASH=0dcc89f9bf67a2a515bad64569b7a9615edc5e018f676a578d5fd0f17d3c81d4 DEVTOOLS_HASH=a8ebeb4bed624700f727179e6ef771dafe47651131a00a78b342251415646acc PATCHELF_HASH=d9afdff4baeacfbc64861454f368b7f2c15c44d245293f7587bbf726bfe722fb @@ -50,6 +50,10 @@ yum -y install bzip2 make git patch unzip bison yasm diffutils \ devtoolset-2-gcc-c++ devtoolset-2-gcc-gfortran \ ${PYTHON_COMPILE_DEPS} +echo "==================gcc=================" +gcc --version +echo "==================gcc=================" + # Install newest autoconf build_autoconf $AUTOCONF_ROOT $AUTOCONF_HASH autoconf --version diff --git a/docker/build_scripts/build_utils.sh b/docker/build_scripts/build_utils.sh index 64efeec..da7cf11 100755 --- a/docker/build_scripts/build_utils.sh +++ b/docker/build_scripts/build_utils.sh @@ -49,6 +49,12 @@ function do_cpython_build { mkdir -p ${prefix}/lib # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6 CFLAGS="-Wformat" ./configure --prefix=${prefix} --disable-shared $unicode_flags > /dev/null + echo "++++++++++++++++++gcc++++++++++++++++++" + gcc --version + cc --version + echo "++++++++++++++++++config.log++++++++++++++++++" + cat ./config.log + echo "++++++++++++++++++config.log++++++++++++++++++" make -j2 > /dev/null make install > /dev/null popd @@ -69,7 +75,7 @@ function build_cpython { local py_ver=$1 check_var $py_ver check_var $PYTHON_DOWNLOAD_URL - wget -q $PYTHON_DOWNLOAD_URL/$py_ver/Python-$py_ver.tgz + wget -q $PYTHON_DOWNLOAD_URL/${py_ver%[a-z][0-9]}/Python-$py_ver.tgz if [ $(lex_pyver $py_ver) -lt $(lex_pyver 3.3) ]; then do_cpython_build $py_ver ucs2 do_cpython_build $py_ver ucs4