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

linux-fresh: Install Boost through Conan

Browse source 
Ubuntu 20.04's version of Boost (1.71.0) is older than yuzu's minimum requirement
(1.73.0). Thus the container was downloading Boost through conan each
time it builds yuzu.

Instead, install Boost through Conan ahead of time, as opposed to
installed effectively garbage.
This commit is contained in:
lat9nq 2020-12-08 17:38:11 -05:00
parent c5385aef7e
commit cbbee60824
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linux-fresh/Dockerfile
View file

@ -11,7 +11,6 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
libavcodec-dev \ libavcodec-dev \
libavutil-dev \ libavutil-dev \
libswscale-dev \ libswscale-dev \
libboost-all-dev \
liblz4-dev \ liblz4-dev \
libopus-dev \ libopus-dev \
libsdl2-dev \ libsdl2-dev \
@ -38,6 +37,7 @@ RUN apt-get clean autoclean && \
apt-get autoremove --yes && \ apt-get autoremove --yes && \
rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log rm -rf /var/lib/apt /var/lib/dpkg /var/lib/cache /var/lib/log
USER 1027 USER 1027
RUN conan install catch2/2.13.0@ -s compiler.libcxx=libstdc++11 --build=missing && \ RUN conan install boost/1.73.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install catch2/2.13.0@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install fmt/7.1.2@ -s compiler.libcxx=libstdc++11 --build=missing && \ conan install fmt/7.1.2@ -s compiler.libcxx=libstdc++11 --build=missing && \
conan install nlohmann_json/3.9.1@ -s compiler.libcxx=libstdc++11 --build=missing conan install nlohmann_json/3.9.1@ -s compiler.libcxx=libstdc++11 --build=missing