From 928aa3ea84597db99e9790160e815ca1177246b6 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Maheux Date: Tue, 9 Jul 2024 19:45:20 -0400 Subject: [PATCH] Disable SVE for libvpx. --- docker/ubuntu-24.04/Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docker/ubuntu-24.04/Dockerfile b/docker/ubuntu-24.04/Dockerfile index 2094a33..1bdd366 100644 --- a/docker/ubuntu-24.04/Dockerfile +++ b/docker/ubuntu-24.04/Dockerfile @@ -8,15 +8,7 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \ ninja-build libssl-dev libboost-all-dev libglib2.0-dev libgtk-3-dev libpulse-dev libasound2-dev patch # Install cross-compiler -RUN apt install -y g++-14-aarch64-linux-gnu gcc-14-aarch64-linux-gnu gcc-14-arm-linux-gnueabihf g++-14-arm-linux-gnueabihf clang -RUN update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-14 100 -RUN update-alternatives --install /usr/bin/aarch64-linux-gnu-g++ aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-g++-14 100 -RUN update-alternatives --set aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-14 -RUN update-alternatives --set aarch64-linux-gnu-g++ /usr/bin/aarch64-linux-gnu-g++-14 -RUN update-alternatives --install /usr/bin/arm-linux-gnueabihf-gcc arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-14 100 -RUN update-alternatives --install /usr/bin/arm-linux-gnueabihf-g++ arm-linux-gnueabihf-g++ /usr/bin/arm-linux-gnueabihf-g++-14 100 -RUN update-alternatives --set arm-linux-gnueabihf-gcc /usr/bin/arm-linux-gnueabihf-gcc-14 -RUN update-alternatives --set arm-linux-gnueabihf-g++ /usr/bin/arm-linux-gnueabihf-g++-14 +RUN apt install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf clang # Define a build-time argument ARG BUILD_TYPE=Release @@ -39,6 +31,8 @@ WORKDIR /root/webrtc-native-build/3rdParty/webrtc_native/webrtc/src/third_party/ RUN git checkout 7c2b62e93487b772990fddc1905f22d4cfaee4a4 WORKDIR /root/webrtc-native-build/build +RUN patch -u ../3rdParty/webrtc_native/webrtc/src/third_party/libvpx/BUILD.gn ../patches/libvpx_BUILD.gn.patch +RUN cmake ../ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} RUN export PATH=/root/webrtc-native-build/3rdParty/depot_tools:$PATH && make -j2 RUN make install