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

Jump to bottom

upgrade llvm from 3.9 to 9 #606

Merged
merged 1 commit into from
Apr 21, 2022
Merged

upgrade llvm from 3.9 to 9 #606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 9 additions & 40 deletions src/ubuntu/18.04/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ FROM ubuntu:18.04
# them in a different layer.
RUN apt-get update \
jkotas marked this conversation as resolved.
Show resolved Hide resolved
&& apt-get install -y \
clang-3.9 \
clang-9 \
gdb \
liblldb-3.9-dev \
lldb-3.9 \
llvm-3.9 \
liblldb-9-dev \
lldb-9 \
llvm-9 \
locales \
make \
python-lldb-3.9 \
python-lldb-9 \
sudo \
wget \
&& rm -rf /var/lib/apt/lists/* \
&& wget https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz \
&& tar -xf cmake-3.10.2-Linux-x86_64.tar.gz --strip 1 -C /usr/local \
&& rm cmake-3.10.2-Linux-x86_64.tar.gz
&& wget https://cmake.org/files/v3.23/cmake-3.23.1-linux-x86_64.tar.gz \
&& tar -xf cmake-3.23.1-linux-x86_64.tar.gz --strip 1 -C /usr/local \
&& rm cmake-3.23.1-linux-x86_64.tar.gz

# Install tools used by the VSO build automation.
RUN apt-get update \
Expand Down Expand Up @@ -56,6 +56,7 @@ RUN apt-get update \
&& apt-get install -y \
autoconf \
automake \
curl \
Copy link
Member

Choose a reason for hiding this comment

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

I think we should keep building the curl from sources. There was a reason for that, I think it was to get libcurl built with the right APIs.

Copy link
Member Author

Choose a reason for hiding this comment

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

in the very old days, we used curl directly in HttpClient and it did matter what SSL backend was used. I don't think this is the case any more.
That change is 4 years old touching libcurl-openssl1.0-dev as well.

Copy link
Member

Choose a reason for hiding this comment

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

Ok, then I'm fine with it.

build-essential \
gettext \
libgdiplus \
Expand All @@ -69,35 +70,3 @@ RUN apt-get update \
libunwind8-dev \
uuid-dev \
&& rm -rf /var/lib/apt/lists/*

# Build and install curl 7.45.0
RUN wget https://curl.haxx.se/download/curl-7.45.0.tar.lzma \
&& tar -xf curl-7.45.0.tar.lzma \
&& rm curl-7.45.0.tar.lzma \
&& cd curl-7.45.0 \
&& ./configure \
--disable-dict \
--disable-ftp \
--disable-gopher \
--disable-imap \
--disable-ldap \
--disable-ldaps \
--disable-libcurl-option \
--disable-manual \
--disable-pop3 \
--disable-rtsp \
--disable-smb \
--disable-smtp \
--disable-telnet \
--disable-tftp \
--enable-ipv6 \
--enable-optimize \
--enable-symbol-hiding \
--with-ca-path=/etc/ssl/certs/ \
--with-nghttp2 \
--with-gssapi \
--with-ssl \
--without-librtmp \
&& make install \
&& cd .. \
&& rm -r curl-7.45.0