MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-19 19:33:45 +02:00
Code Issues Releases Wiki Activity

docker: Add build arg for extra packages; move opencl/libclc.

Browse source
This commit is contained in:
Jason Volk 2023-04-09 02:13:24 -07:00
parent e30c77283c
commit af783c8dfe
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/build-and-push-images.sh
View file

@ -221,6 +221,12 @@ args_toolchain()
return 0 return 0
;; ;;
clang*) clang*)
if test "$_epoch" -ge 15; then
extra="mesa-opencl-icd"
extra="${extra} ocl-icd-opencl-dev"
extra="${extra} libclc-${_epoch}-dev"
args="$args --build-arg extra_packages=\"${extra}\""
fi
extra_dev="clang-${_epoch}" extra_dev="clang-${_epoch}"
extra_dev="${extra_dev} llvm-${_epoch}" extra_dev="${extra_dev} llvm-${_epoch}"
extra_dev="${extra_dev} llvm-spirv-${_epoch}" extra_dev="${extra_dev} llvm-spirv-${_epoch}"

5
docker/ubuntu/full/Dockerfile
View file

@ -6,11 +6,12 @@ ARG machine
FROM ${acct}/${repo}:${dist_name}-${dist_version}-base-${machine} FROM ${acct}/${repo}:${dist_name}-${dist_version}-base-${machine}
ARG extra_packages
ENV packages="\ ENV packages="\
libgraphicsmagick-q16-3 \ libgraphicsmagick-q16-3 \
libpng16-16 \ libpng16-16 \
mesa-opencl-icd \ ${extra_packages} \
ocl-icd-opencl-dev \
" "
ENV packages_dev="\ ENV packages_dev="\