Skip to content
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

Add lld linker to the centos, alpine and crossbuild images #446

Merged
merged 5 commits into from
Jul 14, 2021
Merged

Add lld linker to the centos, alpine and crossbuild images #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a066cb
Add lld linker to the centos, alpine and crossbuild images
janvorli May 4, 2021
e491e24
Update image build timeouts for the prolonged lld build
janvorli Jul 9, 2021
9fb1177
Fix Alpine Node PGP key servers
janvorli Jul 9, 2021
39117ea
Fix fpm git dependency
janvorli Jul 13, 2021
9651662
Fix keyservers for Alpine 3.13
janvorli Jul 13, 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
2 changes: 1 addition & 1 deletion eng/pipelines/dotnet-buildtools-prereqs-centos7-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ variables:
stages:
- template: ../common/templates/stages/build-test-publish-repo.yml
parameters:
linuxAmdBuildJobTimeout: 210
linuxAmdBuildJobTimeout: 300
2 changes: 1 addition & 1 deletion eng/pipelines/dotnet-buildtools-prereqs-centos7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ variables:
stages:
- template: ../common/templates/stages/build-test-publish-repo.yml
parameters:
linuxAmdBuildJobTimeout: 210
linuxAmdBuildJobTimeout: 300
5 changes: 2 additions & 3 deletions src/alpine/3.13/WithNode/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ RUN apk add --no-cache --virtual .build-deps-yarn \
&& for key in \
6A010C5166006599AA17F08146C2130DFD2497F5 \
; do \
gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" \
|| gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" \
|| gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" \
|| gpg --keyserver hkps://keys.openpgp.org --recv-keys "$key"; \
done \
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
Expand Down
5 changes: 2 additions & 3 deletions src/alpine/3.9/WithNode/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ RUN apk add --no-cache \
77984A986EBC2AA786BC0F66B01FBB92821C587A \
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
; do \
gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" \
|| gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" \
|| gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" \
|| gpg --keyserver hkps://keys.openpgp.org --recv-keys "$key"; \
done \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
&& curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
Expand Down
1 change: 1 addition & 0 deletions src/alpine/3.9/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN apk add --no-cache \
libtool \
libunwind-dev \
linux-headers \
lld \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alpine 3.9 is EOL and will be deleted soon: https://github.com/dotnet/dotnet-buildtools-prereqs-docker/issues/442

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still use it to build runtime for Alpine and we don't have equivalent one for 3.10 yet. Would you like me to add the 3.10 one in this PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean the 3.11, as the 3.10 is EOL too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alpine 3.11 is EOL in Nov 2021 so we'll just have to do it all over again then. It'd be preferable to just jump to the latest, Alpine 3.13 to buy us an extra year.

llvm \
make \
openssl \
Expand Down
4 changes: 4 additions & 0 deletions src/centos/7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,23 @@ RUN wget -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/
RUN wget ftp://sourceware.org/pub/binutils/snapshots/binutils-2.29.1.tar.xz && \
wget http://releases.llvm.org/9.0.0/cfe-9.0.0.src.tar.xz && \
wget http://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz && \
wget http://releases.llvm.org/9.0.0/lld-9.0.0.src.tar.xz && \
wget http://releases.llvm.org/9.0.0/lldb-9.0.0.src.tar.xz && \
wget http://releases.llvm.org/9.0.0/compiler-rt-9.0.0.src.tar.xz && \
\
tar -xf binutils-2.29.1.tar.xz && \
tar -xf llvm-9.0.0.src.tar.xz && \
mkdir llvm-9.0.0.src/tools/clang && \
mkdir llvm-9.0.0.src/tools/lld && \
mkdir llvm-9.0.0.src/tools/lldb && \
mkdir llvm-9.0.0.src/projects/compiler-rt && \
tar -xf cfe-9.0.0.src.tar.xz --strip 1 -C llvm-9.0.0.src/tools/clang && \
tar -xf lld-9.0.0.src.tar.xz --strip 1 -C llvm-9.0.0.src/tools/lld && \
tar -xf lldb-9.0.0.src.tar.xz --strip 1 -C llvm-9.0.0.src/tools/lldb && \
tar -xf compiler-rt-9.0.0.src.tar.xz --strip 1 -C llvm-9.0.0.src/projects/compiler-rt && \
rm binutils-2.29.1.tar.xz && \
rm cfe-9.0.0.src.tar.xz && \
rm lld-9.0.0.src.tar.xz && \
rm lldb-9.0.0.src.tar.xz && \
rm llvm-9.0.0.src.tar.xz && \
rm compiler-rt-9.0.0.src.tar.xz && \
Expand Down
1 change: 1 addition & 0 deletions src/centos/7/rpmpkg/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN yum clean all \
ruby-devel \
rubygems \
&& gem install --no-document \
git:1.7.0 \
ffi:1.12.2 \
fpm \
&& yum clean all
Expand Down
1 change: 1 addition & 0 deletions src/centos/8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN dnf install --setopt tsflags=nodocs --refresh -y \
libtool \
libuuid-devel \
libxml2-devel \
lld \
lldb-devel \
llvm \
lttng-ust-devel \
Expand Down
1 change: 1 addition & 0 deletions src/ubuntu/18.04/crossdeps/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ RUN apt-get update \
clang-9 \
clang-tools-9 \
liblldb-6.0-dev \
lld-9 \
lldb-6.0 \
llvm-9 \
python-lldb-6.0 \
Expand Down