Skip to content

Fix python3 six and make issue on Amazon Linux 2 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 1, 2021
Merged

Fix python3 six and make issue on Amazon Linux 2 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28826e6
Update build_rpm.sh
shahmishal Oct 21, 2021
e02007e
Add make to Amazon Linux 2
shahmishal Oct 21, 2021
016b0a1
Move the workaround from spec script to Dockerfile
shahmishal Oct 25, 2021
87b32c2
Drop CMake build requires because it's built by swift build-script
shahmishal Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions platforms/Linux/amazonlinux/2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion platforms/Linux/amazonlinux/2/swiftlang.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions platforms/Linux/centos/7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions platforms/Linux/centos/7/build_rpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion platforms/Linux/centos/7/swiftlang.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion platforms/Linux/centos/8/swiftlang.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Patch1: patches/hwasan_symbolize.patch

BuildRequires: autoconf
BuildRequires: clang
BuildRequires: cmake
BuildRequires: diffutils
BuildRequires: git
BuildRequires: glibc-static
Expand Down