deps: use backported cmake from the repo
This commit is contained in:
parent
c0e07aed6c
commit
43cc06d882
|
@ -28,6 +28,6 @@ export LDFLAGS="-flto -fuse-linker-plugin -fuse-ld=gold"
|
||||||
"$TOPDIR"/deps.sh
|
"$TOPDIR"/deps.sh
|
||||||
|
|
||||||
mkdir -p build && cd build
|
mkdir -p build && cd build
|
||||||
cmake .. -GNinja -DYUZU_TESTS=OFF -DLIBUSB_FOUND=TRUE -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF -DENABLE_QT=OFF -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DUSE_DISCORD_PRESENCE=OFF
|
cmake .. -GNinja -DYUZU_USE_BUNDLED_FFMPEG=ON -DYUZU_TESTS=OFF -DENABLE_LIBUSB=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF -DENABLE_QT=OFF -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DUSE_DISCORD_PRESENCE=OFF
|
||||||
ninja yuzu-room
|
ninja yuzu-room
|
||||||
strip ./bin/yuzu-room
|
strip ./bin/yuzu-room
|
||||||
|
|
|
@ -5,7 +5,7 @@ JSON_VERSION="3.11.2"
|
||||||
ZLIB_VERSION="1.2.13"
|
ZLIB_VERSION="1.2.13"
|
||||||
ZSTD_VERSION="1.5.2"
|
ZSTD_VERSION="1.5.2"
|
||||||
LZ4_VERSION="1.9.4"
|
LZ4_VERSION="1.9.4"
|
||||||
BOOST_VERSION="1.80.0"
|
BOOST_VERSION="1.81.0"
|
||||||
|
|
||||||
cmake_install() {
|
cmake_install() {
|
||||||
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON "$@"
|
cmake . -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON "$@"
|
||||||
|
@ -60,7 +60,7 @@ EOF
|
||||||
popd
|
popd
|
||||||
|
|
||||||
info "boost ${BOOST_VERSION}"
|
info "boost ${BOOST_VERSION}"
|
||||||
download_extract "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION//\./_}.tar.gz" "boost_${BOOST_VERSION//\./_}" 4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847
|
download_extract "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION//\./_}.tar.gz" "boost_${BOOST_VERSION//\./_}" 205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
|
||||||
# Boost use its own ad-hoc build system
|
# Boost use its own ad-hoc build system
|
||||||
# we only enable what yuzu needs
|
# we only enable what yuzu needs
|
||||||
./bootstrap.sh --with-libraries=context,container,system,headers
|
./bootstrap.sh --with-libraries=context,container,system,headers
|
||||||
|
|
|
@ -2,8 +2,10 @@
|
||||||
FROM debian:bullseye AS build
|
FROM debian:bullseye AS build
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ARG USE_CCACHE
|
ARG USE_CCACHE
|
||||||
RUN apt-get update && apt-get -y full-upgrade && \
|
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list && \
|
||||||
apt-get install -y build-essential wget git ccache cmake ninja-build libssl-dev pkg-config libarchive-tools
|
apt-get update && apt-get -y full-upgrade && \
|
||||||
|
apt-get install -y build-essential wget git ccache ninja-build libssl-dev pkg-config libarchive-tools \
|
||||||
|
cmake/bullseye-backports cmake-data/bullseye-backports
|
||||||
|
|
||||||
COPY . /root/build-files
|
COPY . /root/build-files
|
||||||
|
|
||||||
|
|
Reference in New Issue