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

Build LLVM with support for compression #95545

Closed
wants to merge 2 commits into from
Closed

Build LLVM with support for compression #95545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
764af14
Build LLVM with support for compression
Mar 31, 2022
fa7807b
Install aarch64 zlib for host-x86_64/dist-aarch64
Apr 4, 2022
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
1 change: 1 addition & 0 deletions src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
sudo \
gdb \
libssl-dev \
zlib1g-dev \
pkg-config \
xz-utils

Expand Down
4 changes: 4 additions & 0 deletions src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ RUN sh /scripts/cross-apt-packages.sh
COPY scripts/make3.sh /scripts/
RUN sh /scripts/make3.sh

# We need an aarch64 build of zlib for parity with x86_64.
# See https://github.com/rust-lang/rust/pull/95545.
RUN dpkg --add-architecture arm64 && apt-get update && apt-get install zlib1g-dev:arm64
Copy link
Member

Choose a reason for hiding this comment

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

I suspect that maybe ubuntu 16.04 is too old for arm64 packages to exist?

2022-04-10T14:50:13.8693747Z E: Failed to fetch http://archive.ubuntu.com/ubuntu/dists/xenial/main/binary-arm64/Packages  404  Not Found
2022-04-10T14:50:13.8695825Z E: Failed to fetch http://archive.ubuntu.com/ubuntu/dists/xenial-updates/main/binary-arm64/Packages  404  Not Found
2022-04-10T14:50:13.8697689Z E: Failed to fetch http://archive.ubuntu.com/ubuntu/dists/xenial-backports/main/binary-arm64/Packages  404  Not Found
2022-04-10T14:50:13.8699323Z E: Failed to fetch http://security.ubuntu.com/ubuntu/dists/xenial-security/main/binary-arm64/Packages  404  Not Found

We probably don't want to upgrade the baseline environment here if we can avoid it (since that bumps libc versions etc), so it might be necessary to either build the library here from scratch (like we do for make etc)... We can also try fetching it from a newer ubuntu (like we do with the cacerts) but that seems potentially annoying due to the libc issues.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, that's a good point. @joshtriplett given you initially suggested dpkg --add-architecture, do you have thoughts on this?

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I think the problem is that in 16.04 arm64 was on ports.ubuntu.com, which requires adding a separate source.

Copy link
Member

Choose a reason for hiding this comment

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

You need to modify the existing sources entries to use deb [arch=amd64,i386] and add a new one for ports.ubuntu.com that uses deb [arch=arm64].


COPY scripts/crosstool-ng.sh /scripts/
RUN sh /scripts/crosstool-ng.sh

Expand Down