Merge pull request #47 from rillian/fixes

Fix bitrot in dist/Dockerfile

Author: alexcrichton

slaves/dist/Dockerfile

@@ -24,30 +24,13 @@ RUN mkdir /buildslave && chown rustbuild:rustbuild /buildslave
 RUN mkdir /home/rustbuild
 RUN chown rustbuild:rustbuild /home/rustbuild
 
-# binutils < 2.22 has a bug where the 32-bit executables it generates
-# immediately segfault in Rust, so we need to install our own binutils.
-#
-# See https://github.com/rust-lang/rust/issues/20440 for more info
-COPY dist/build_binutils.sh /build/
-RUN sh build_binutils.sh && rm -rf /build
-
 # Install gcc 4.7 which has C++11 support which is required by LLVM
 #
 # After we're done building we erase the binutils/gcc installs from CentOS to
 # ensure that we always use the ones that we just built.
 COPY dist/build_gcc.sh /build/
 RUN sh build_gcc.sh && rm -rf /build
 
-# libssh2 (a dependency of Cargo) requires cmake 2.8.11 or higher but CentOS
-# only has 2.6.4, so build our own
-COPY dist/build_cmake.sh /build/
-RUN sh build_cmake.sh && rm -rf /build
-
-# tar on CentOS is too old as it doesn't understand the --exclude-vcs option
-# that the Rust build system passes it, so install a new version.
-COPY dist/build_tar.sh /build/
-RUN sh build_tar.sh && rm -rf /build
-
 # We need a build of openssl which supports SNI to download artifacts from
 # static.rust-lang.org. This'll be used to link into libcurl below (and used
 # later as well), so build a copy of OpenSSL with dynamic libraries into our
@@ -64,6 +47,23 @@ RUN sh build_openssl.sh && rm -rf /build
 COPY dist/build_curl.sh /build/
 RUN sh build_curl.sh
 
+# binutils < 2.22 has a bug where the 32-bit executables it generates
+# immediately segfault in Rust, so we need to install our own binutils.
+#
+# See https://github.com/rust-lang/rust/issues/20440 for more info
+COPY dist/build_binutils.sh /build/
+RUN sh build_binutils.sh && rm -rf /build
+
+# libssh2 (a dependency of Cargo) requires cmake 2.8.11 or higher but CentOS
+# only has 2.6.4, so build our own
+COPY dist/build_cmake.sh /build/
+RUN sh build_cmake.sh && rm -rf /build
+
+# tar on CentOS is too old as it doesn't understand the --exclude-vcs option
+# that the Rust build system passes it, so install a new version.
+COPY dist/build_tar.sh /build/
+RUN sh build_tar.sh && rm -rf /build
+
 # CentOS 5.5 has Python 2.4 by default, but LLVM needs 2.7+
 COPY dist/build_python.sh /build/
 RUN sh build_python.sh && rm -rf /build

slaves/dist/build_binutils.sh

@@ -8,3 +8,4 @@ cd binutils-build
 ../binutils-2.25.1/configure --prefix=/rustroot
 make -j10
 make install
+yum erase -y binutils

slaves/dist/build_cmake.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-curl http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz | tar xzf -
+curl https://cmake.org/files/v3.3/cmake-3.3.2.tar.gz | tar xzf -
 mkdir cmake-build
 cd cmake-build
 ../cmake-3.3.2/configure --prefix=/rustroot

slaves/dist/build_curl.sh

@@ -5,7 +5,7 @@ set -ex
 curl http://curl.haxx.se/download/curl-7.44.0.tar.bz2 | tar xjf -
 mkdir curl-build
 cd curl-build
-../curl-7.44.0/configure --prefix=/rustroot \
+../curl-7.44.0/configure --prefix=/rustroot --with-ssl=/rustroot \
       --disable-sspi --disable-gopher --disable-smtp --disable-smb \
       --disable-imap --disable-pop3 --disable-tftp --disable-telnet \
       --disable-manual --disable-dict --disable-rtsp --disable-ldaps \

slaves/dist/build_gcc.sh

@@ -12,4 +12,4 @@ cd ../gcc-4.7.4-build
 make -j10
 make install
 ln -nsf gcc /rustroot/bin/cc
-yum erase -y gcc wget binutils
+yum erase -y gcc wget