yuzu-emu/build-environments
1
0
Fork 0
mirror of https://github.com/yuzu-emu/build-environments.git synced 2024-11-22 17:25:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from lat9nq/mingw-no-32bit

Browse Source 
mingw: Delete 32 bit binaries and fix container
This commit is contained in:
bunnei 2021-05-31 01:31:15 -07:00 committed by GitHub
commit b237f34101
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
linux-mingw/Dockerfile
View File

@ -1,5 +1,10 @@
FROM archlinux:latest FROM archlinux:latest
MAINTAINER yuzu MAINTAINER yuzu
# 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"
# 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 current distro packages # 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. # and the second run actually pulls the updates from the repos.
@ -17,13 +22,11 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
glslang \ glslang \
python-pip \ python-pip \
python \ python \
python2 \
ccache \ ccache \
p7zip \ p7zip \
cmake \ cmake \
ninja \ ninja \
mingw-w64-boost \ mingw-w64-boost \
mingw-w64-ffmpeg \
mingw-w64-gcc \ mingw-w64-gcc \
mingw-w64-lz4 \ mingw-w64-lz4 \
mingw-w64-opus \ mingw-w64-opus \
@ -39,7 +42,7 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
mingw-w64-zstd \ mingw-w64-zstd \
&& \ && \
pacman -Scc --noconfirm && \ pacman -Scc --noconfirm && \
rm -rf /usr/share/man/ /tmp/* /var/tmp/ rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32
# Setup extra mingw work arounds # Setup extra mingw work arounds
RUN pip3 install pefile RUN pip3 install pefile