From d19fdb2abb2930648e4596b5fad1333a9779c908 Mon Sep 17 00:00:00 2001 From: Hans Pabst Date: Tue, 26 May 2026 11:18:52 +0200 Subject: [PATCH] Fixed build order - LIBXS <-> LIBXSTREAM. --- tools/docker/Dockerfile.build-env-ubuntu | 12 +++++++++--- tools/docker/Dockerfile.build-env-ubuntu-cuda | 17 ++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/tools/docker/Dockerfile.build-env-ubuntu b/tools/docker/Dockerfile.build-env-ubuntu index 044fb17e8f2..9e44611354d 100644 --- a/tools/docker/Dockerfile.build-env-ubuntu +++ b/tools/docker/Dockerfile.build-env-ubuntu @@ -55,19 +55,25 @@ RUN set -ex ; \ git-archive-all \ ; -ENV PKG_CONFIG_PATH="/opt/libxstream/lib/pkgconfig:/opt/libxs/lib/pkgconfig:${PKG_CONFIG_PATH}" - RUN set -ex ; \ apt-get update ; \ apt-get install -y --no-install-recommends opencl-c-headers ocl-icd-libopencl1 ; \ rm -rf /var/lib/apt/lists/* +ARG libxs_version=1d776c091fb41d4aa7bc92335f6387878e1a9db6 ARG libxstream_version=87bbd69f0cdf6ca23801923ee201f960fb37860f +RUN set -ex ; \ + curl -LsS https://github.com/hfp/libxs/archive/${libxs_version}.tar.gz | tar -xz -C /opt ; \ + ln -s libxs-${libxs_version} /opt/libxs ; \ + make -j -C /opt/libxs + RUN set -ex ; \ curl -LsS https://github.com/hfp/libxstream/archive/${libxstream_version}.tar.gz | tar -xz -C /opt ; \ ln -s libxstream-${libxstream_version} /opt/libxstream ; \ - make -j -C /opt/libxstream + make -j -C /opt/libxstream LIBXSROOT=/opt/libxs + +ENV PKG_CONFIG_PATH="/opt/libxstream/lib/pkgconfig:/opt/libxs/lib/pkgconfig:${PKG_CONFIG_PATH}" ARG libxs_version=1d776c091fb41d4aa7bc92335f6387878e1a9db6 diff --git a/tools/docker/Dockerfile.build-env-ubuntu-cuda b/tools/docker/Dockerfile.build-env-ubuntu-cuda index 31ec2de6fbf..8665bb1b3c9 100644 --- a/tools/docker/Dockerfile.build-env-ubuntu-cuda +++ b/tools/docker/Dockerfile.build-env-ubuntu-cuda @@ -46,27 +46,26 @@ RUN set -ex ; \ git-archive-all \ ; -ENV PKG_CONFIG_PATH="/opt/libxstream/lib/pkgconfig:/opt/libxs/lib/pkgconfig:${PKG_CONFIG_PATH}" - RUN set -ex ; \ apt-get update ; \ apt-get install -y --no-install-recommends opencl-c-headers ocl-icd-libopencl1 ; \ rm -rf /var/lib/apt/lists/* -ARG libxstream_version=87bbd69f0cdf6ca23801923ee201f960fb37860f - -RUN set -ex ; \ - curl -LsS https://github.com/hfp/libxstream/archive/${libxstream_version}.tar.gz | tar -xz -C /opt ; \ - ln -s libxstream-${libxstream_version} /opt/libxstream ; \ - make -j -C /opt/libxstream - ARG libxs_version=1d776c091fb41d4aa7bc92335f6387878e1a9db6 +ARG libxstream_version=87bbd69f0cdf6ca23801923ee201f960fb37860f RUN set -ex ; \ curl -LsS https://github.com/hfp/libxs/archive/${libxs_version}.tar.gz | tar -xz -C /opt ; \ ln -s libxs-${libxs_version} /opt/libxs ; \ make -j -C /opt/libxs +RUN set -ex ; \ + curl -LsS https://github.com/hfp/libxstream/archive/${libxstream_version}.tar.gz | tar -xz -C /opt ; \ + ln -s libxstream-${libxstream_version} /opt/libxstream ; \ + make -j -C /opt/libxstream LIBXSROOT=/opt/libxs + +ENV PKG_CONFIG_PATH="/opt/libxstream/lib/pkgconfig:/opt/libxs/lib/pkgconfig:${PKG_CONFIG_PATH}" + # Leak suppression COPY lsan.supp /opt ENV LSAN_OPTIONS=suppressions=/opt/lsan.supp