mingw: Remove glibc workaround

ccache requires a newer version of glibc than could be provided with the
Azure workaround. Revert 87c73e5b5d so
that ccache will work.

This may not work with Azure. If that is the case, we will need to
revert ccache to an earlier build.
This commit is contained in:
lat9nq 2022-02-20 20:51:02 -05:00
parent 4fac039127
commit 964bfcf73e

View File

@ -2,12 +2,7 @@ FROM archlinux:latest
LABEL maintainer="yuzu" LABEL maintainer="yuzu"
ENV EXT_BIN_URL="https://github.com/yuzu-emu/ext-linux-bin/raw/main/mingw" ENV EXT_BIN_URL="https://github.com/yuzu-emu/ext-linux-bin/raw/main/mingw"
# Workaround for Arch Linux Docker image failing to build
# From https://stackoverflow.com/questions/66154574
RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst && \
curl -LO "https://repo.archlinuxcn.org/x86_64/$patched_glibc" && \
bsdtar -C / -xvf "$patched_glibc" && \
echo 'IgnorePkg = glibc' >> /etc/pacman.conf
# Add mingw-repo "ownstuff" is a AUR with an up to date mingw64 # Add mingw-repo "ownstuff" is a AUR with an up to date mingw64
# Runs pacman -Syu twice in order to work around pacman issues where the first run only updates the # Runs pacman -Syu twice in order to work around pacman issues where the first run only updates the
# current distro packages, and the second run actually pulls the updates from the repos. # current distro packages, and the second run actually pulls the updates from the repos.