Skip to content

Fixed build order #1013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hfp merged 1 commit into from
May 26, 2026
+17 −12
Merged

Fixed build order #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions tools/docker/Dockerfile.build-env-ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 8 additions & 9 deletions tools/docker/Dockerfile.build-env-ubuntu-cuda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading