Merge pull request swiftlang#48 from apple/shahmishal/fix-python3-six-amazonlinux2

Fix python3 six and make issue on Amazon Linux 2

Author: shahmishal

Diff for: platforms/Linux/amazonlinux/2/Dockerfile

@@ -21,3 +21,7 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
 ADD swiftlang.spec /tmp/swiftlang.spec
 RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
 RUN cd /tmp && yum-builddep -y swiftlang.spec
+
+# fix python six
+RUN mkdir -p /usr/local/lib/python3.7/site-packages/
+RUN easy_install-3.7 six

Diff for: platforms/Linux/amazonlinux/2/swiftlang.spec

@@ -35,7 +35,6 @@ Patch0:         patches/swift-api-checker.patch
 Patch1:         patches/hwasan_symbolize.patch
 
 BuildRequires:  clang
-BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  git
@@ -45,6 +44,7 @@ BuildRequires:  libedit-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  make
 BuildRequires:  ncurses-devel
 BuildRequires:  pexpect
 BuildRequires:  pkgconfig

Diff for: platforms/Linux/centos/7/Dockerfile

@@ -21,3 +21,8 @@ RUN yum install -y epel-release centos-release-scl
 ADD swiftlang.spec /tmp/swiftlang.spec
 RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
 RUN cd /tmp && yum-builddep -y swiftlang.spec
+
+# Workaround to support clang-3.5 or a later version
+RUN echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/llvm-toolset-7/enable\n. /opt/rh/devtoolset-8/enable\n" >> $HOME/.bashrc
+RUN source $HOME/.bashrc
+RUN sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h

Diff for: platforms/Linux/centos/7/build_rpm.sh

@@ -32,10 +32,6 @@ cp patches/*.patch $HOME/rpmbuild/SOURCES/
 pushd $HOME/rpmbuild/SPECS
 # install all the dependencies needed to build Swift from the spec file itself
 yum-builddep -y ./swiftlang.spec
-# Workaround to support clang-3.5 or a later version
-echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/llvm-toolset-7/enable\n. /opt/rh/devtoolset-8/enable\n" >> $HOME/.bashrc
-source $HOME/.bashrc
-sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h
 # get the sources for Swift as defined in the spec file
 spectool -g -R ./swiftlang.spec
 # Now we proceed to build Swift. If this is successful, we

Diff for: platforms/Linux/centos/7/swiftlang.spec

@@ -35,7 +35,6 @@ Patch0:         patches/swift-api-checker.patch
 Patch1:         patches/hwasan_symbolize.patch
 
 BuildRequires:  autoconf
-BuildRequires:  cmake
 BuildRequires:  devtoolset-8
 BuildRequires:  glibc-static
 BuildRequires:  libatomic

Diff for: platforms/Linux/centos/8/swiftlang.spec

@@ -36,7 +36,6 @@ Patch1:         patches/hwasan_symbolize.patch
 
 BuildRequires:  autoconf
 BuildRequires:  clang
-BuildRequires:  cmake
 BuildRequires:  diffutils
 BuildRequires:  git
 BuildRequires:  glibc-static