Move python install dirs to /opt/python and drop the symlinks that do

not include SOABI flags. `for py in /opt/*/bin/python` will now allow
looping over all supported builds.

Author: natefoo

docker/build_scripts/build.sh

@@ -53,8 +53,8 @@ tar -xzf patchelf-0.8.tar.gz
 (cd patchelf-0.8 && ./configure && make && make install)
 rm -rf patchelf-0.8.tar.gz patchelf-0.8
 
-/opt/3.5/bin/pip install git+git://github.com/manylinux/auditwheel.git && \
-ln -s /opt/3.5/bin/auditwheel /usr/local/bin/auditwheel
+/opt/3.5m/bin/pip install git+git://github.com/manylinux/auditwheel.git && \
+ln -s /opt/3.5m/bin/auditwheel /usr/local/bin/auditwheel
 
 # Clean up development headers and other unnecessary stuff for
 # final image
@@ -65,7 +65,6 @@ yum -y install ${MANYLINUX1_DEPS}
 yum -y clean all > /dev/null 2>&1
 yum list installed
 
-# Checks the same interpreters repeatedly, but is more thorough
 for PYTHON in /opt/*/bin/python; do
     $PYTHON $MY_DIR/manylinux1-check.py
 done

docker/build_scripts/build_utils.sh

@@ -28,7 +28,7 @@ function do_python_build {
     check_var $py_ver
     local soabi_flags=$2
     check_var $soabi_flags
-    mkdir -p /opt/${py_ver}${soabi_flags}/lib
+    mkdir -p /opt/python/${py_ver}${soabi_flags}/lib
     if [ $(lex_pyver $py_ver) -lt $(lex_pyver 3.3) ]; then
         if [ $soabi_flags = "mu" ]; then
             local unicode_flags="--enable-unicode=ucs4"
@@ -37,7 +37,7 @@ function do_python_build {
         fi
     fi
     # -Wformat added for https://bugs.python.org/issue17547 on Python 2.6
-    CFLAGS="-Wformat" ./configure --prefix=/opt/${py_ver}${soabi_flags} --disable-shared $unicode_flags > /dev/null
+    CFLAGS="-Wformat" ./configure --prefix=/opt/python/${py_ver}${soabi_flags} --disable-shared $unicode_flags > /dev/null
     make -j2 > /dev/null
     make install > /dev/null
 }
@@ -56,12 +56,11 @@ function build_python {
         tar -xzf Python-$py_ver.tgz
         (cd Python-$py_ver && do_python_build $py_ver $soabi_flags)
         if [ $(lex_pyver $py_ver) -ge $(lex_pyver 3) ]; then \
-            ln -s /opt/${py_ver}${soabi_flags}/bin/python3 /opt/${py_ver}${soabi_flags}/bin/python;
+            ln -s /opt/python/${py_ver}${soabi_flags}/bin/python3 /opt/python/${py_ver}${soabi_flags}/bin/python;
         fi;
-        ln -s /opt/${py_ver}${soabi_flags}/ /opt/${py_ver2}${soabi_flags}
-        [ ! -h /opt/${py_ver2} ] && ln -s /opt/${py_ver}${soabi_flags}/ /opt/$py_ver2
-        /opt/${py_ver}${soabi_flags}/bin/python get-pip.py
-        /opt/${py_ver}${soabi_flags}/bin/pip install wheel
+        ln -s /opt/python/${py_ver}${soabi_flags}/ /opt/${py_ver2}${soabi_flags}
+        /opt/python/${py_ver}${soabi_flags}/bin/python get-pip.py
+        /opt/python/${py_ver}${soabi_flags}/bin/pip install wheel
         rm -rf Python-$py_ver
     done
     rm -f Python-$py_ver.tgz