From ca6884109a465eae024ca1cc792baae241918c7e Mon Sep 17 00:00:00 2001 From: El Date: Fri, 9 May 2025 19:19:50 +0500 Subject: [PATCH] VNC-127 Set GCC 14 explicitly and adjust build script order --- builder/dockerfile.opensuse_15.build | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builder/dockerfile.opensuse_15.build b/builder/dockerfile.opensuse_15.build index 50596f2..5a2c6fc 100644 --- a/builder/dockerfile.opensuse_15.build +++ b/builder/dockerfile.opensuse_15.build @@ -50,10 +50,6 @@ RUN zypper install -ny \ zlib-devel \ tbb-devel -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-14 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-14 - RUN useradd -u 1000 docker && \ groupadd -g 1000 docker && \ usermod -a -G docker docker @@ -72,8 +68,11 @@ RUN ARCH=$(arch) && \ rm cmake.sh ENV SCRIPTS_DIR=/tmp/scripts +ENV CC=/usr/bin/gcc-14 +ENV CXX=/usr/bin/g++-14 + COPY builder/scripts $SCRIPTS_DIR -RUN $SCRIPTS_DIR/build-webp && $SCRIPTS_DIR/build-libjpeg-turbo +RUN $SCRIPTS_DIR/build-libjpeg-turbo && $SCRIPTS_DIR/build-webp COPY --chown=docker:docker . /src/