Skip to content

Commit cc5c218

Browse files
committed
Fix gcc and env setup for post install scripts broken by last few commits
1 parent 860e2ed commit cc5c218

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

recipes/paraview/5.13.2/zen2/environments.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ paraview-osmesa:
112112

113113
# offscreen rendering
114114
- mesa +osmesa
115-
- osmesa ^mesa +osmesa
116-
- glew ^[virtuals=gl] osmesa ^mesa +osmesa
115+
- osmesa
116+
- glew
117117

118118
variants:
119119
- ~cuda

recipes/paraview/5.13.2/zen2/post-install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ rm $BUILD_ENV_DEV
190190
sed -i "s|^CMAKE_PREFIX_PATH=|CMAKE_PREFIX_PATH=$PARAVIEW_INSTALL_DIR:|g" $BUILD_ENV
191191

192192
# remove /dev/shm paths from build-env that will not be available to the final user
193-
GCCLOC=$($SPACK_CMD location -i gcc@12)
193+
GCCLOC=$($SPACK_CMD location -i gcc@12 +bootstrap )
194194
sed -i "s|/dev/shm/biddisco/spack/lib/spack/env/gcc|$GCCLOC/bin|g" $BUILD_ENV
195195
sed -i "s|/dev/shm/biddisco/spack/bin|\$PATH|" $BUILD_ENV
196196

0 commit comments

Comments
 (0)