Merge pull request #22 from lat9nq/conan-boost

linux-fresh: Install Boost through Conan
This commit is contained in:
bunnei 2020-12-08 15:06:33 -08:00 committed by GitHub
commit b2661419ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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