From 964bfcf73ea9077c30889cc04179fe891aa6ad59 Mon Sep 17 00:00:00 2001 From: lat9nq Date: Sun, 20 Feb 2022 20:51:02 -0500 Subject: [PATCH] mingw: Remove glibc workaround ccache requires a newer version of glibc than could be provided with the Azure workaround. Revert 87c73e5b5d2dee97bef8d1ef6c17c610872a22a7 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. --- linux-mingw/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/linux-mingw/Dockerfile b/linux-mingw/Dockerfile index e635daa..d1bfd83 100644 --- a/linux-mingw/Dockerfile +++ b/linux-mingw/Dockerfile @@ -2,12 +2,7 @@ FROM archlinux:latest LABEL maintainer="yuzu" 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 # 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.