Skip to content
Snippets Groups Projects
Commit 8b9e694c authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

feat: use system opengl and glx

parent da6b4209
No related branches found
No related tags found
1 merge request!757feat: use system opengl and glx
...@@ -45,6 +45,9 @@ apt-get -yqq install --no-install-recommends \ ...@@ -45,6 +45,9 @@ apt-get -yqq install --no-install-recommends \
less \ less \
libcbor-xs-perl \ libcbor-xs-perl \
libjson-xs-perl \ libjson-xs-perl \
libgl-dev \
libglx-dev \
libopengl-dev \
locales \ locales \
lua-posix \ lua-posix \
make \ make \
......
...@@ -56,6 +56,7 @@ declare -A target=(["linux/amd64"]="x86_64_v2" ["linux/arm64"]="aarch64") ...@@ -56,6 +56,7 @@ declare -A target=(["linux/amd64"]="x86_64_v2" ["linux/arm64"]="aarch64")
target=${target[${TARGETPLATFORM}]} target=${target[${TARGETPLATFORM}]}
spack config --scope site add "packages:all:require:[target=${target}]" spack config --scope site add "packages:all:require:[target=${target}]"
spack config --scope site add "packages:all:target:[${target}]" spack config --scope site add "packages:all:target:[${target}]"
spack external find --scope site llvm
spack config blame packages spack config blame packages
spack config --scope user add "config:suppress_gpg_warnings:true" spack config --scope user add "config:suppress_gpg_warnings:true"
spack config --scope user add "config:build_jobs:${jobs}" spack config --scope user add "config:build_jobs:${jobs}"
......
...@@ -149,6 +149,9 @@ packages: ...@@ -149,6 +149,9 @@ packages:
lcov: lcov:
require: require:
- '@1.16' - '@1.16'
libglx:
require:
- opengl
lhapdf: lhapdf:
require: require:
- '@6.5.1' - '@6.5.1'
...@@ -159,7 +162,7 @@ packages: ...@@ -159,7 +162,7 @@ packages:
mesa: mesa:
require: require:
- '@22.1.6' - '@22.1.6'
- +glx -llvm +opengl +opengles +osmesa - +glx +llvm +opengl +opengles +osmesa
nlohmann-json: nlohmann-json:
require: require:
- '@3.11.2' - '@3.11.2'
...@@ -175,6 +178,10 @@ packages: ...@@ -175,6 +178,10 @@ packages:
require: require:
- '@7.7.1' - '@7.7.1'
- +application_framework -vtk - +application_framework -vtk
opengl:
externals:
- spec: opengl@4.6
prefix: /usr
osg-ca-certs: osg-ca-certs:
require: require:
- '@1.109.igtf.1.117' - '@1.109.igtf.1.117'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment