Merge pull request #72 from lat9nq/boost-79

Install Boost 1.79 for mingw, fresh-arm64
This commit is contained in:
Morph 2023-03-25 18:09:52 -04:00 committed by GitHub
commit 150c299010
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View file

@ -68,7 +68,7 @@ ENV VCPKG_FORCE_SYSTEM_BINARIES=1
USER 1027 USER 1027
# Install vcpkg and required dependencies for yuzu # Install vcpkg and required dependencies for yuzu
RUN cd /home/yuzu &&\ RUN cd /home/yuzu &&\
git clone --depth 1 https://github.com/Microsoft/vcpkg.git &&\ git clone --branch 2022.08.15 --depth 1 https://github.com/Microsoft/vcpkg.git &&\
cd vcpkg &&\ cd vcpkg &&\
./bootstrap-vcpkg.sh &&\ ./bootstrap-vcpkg.sh &&\
./vcpkg install \ ./vcpkg install \

View file

@ -26,7 +26,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
p7zip \ p7zip \
cmake \ cmake \
ninja \ ninja \
mingw-w64-boost \
mingw-w64-gcc \ mingw-w64-gcc \
mingw-w64-libusb \ mingw-w64-libusb \
mingw-w64-lz4 \ mingw-w64-lz4 \
@ -46,6 +45,12 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && mkdir -p /tmp/pkgs && \
pacman -Scc --noconfirm && \ pacman -Scc --noconfirm && \
rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32 rm -rf /usr/share/man/ /tmp/* /var/tmp/ /usr/{i686-w64-mingw32,lib32} /usr/lib/gcc/i686-w64-mingw32
# Install Boost from yuzu-emu/ext-linux-bin
RUN wget --no-verbose \
https://github.com/yuzu-emu/ext-linux-bin/raw/main/mingw/mingw-w64-boost-1.79.0-1-any.pkg.tar.zst && \
pacman -U --noconfirm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst && \
rm mingw-w64-boost-1.79.0-1-any.pkg.tar.zst
# Setup extra mingw work arounds # Setup extra mingw work arounds
RUN pip3 install pefile RUN pip3 install pefile
# Compatibility with the old Ubuntu MingW image # Compatibility with the old Ubuntu MingW image