Skip to content

Commit

Permalink
spack 0.21 uses linux/scientific7 not scientific7
Browse files Browse the repository at this point in the history
  • Loading branch information
marcmengel committed Nov 14, 2023
1 parent e19397a commit 035fa01
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
10 changes: 9 additions & 1 deletion bin/make_packages_yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ done
os=${2:-`spack arch -o`}

optf=$dir/templates/package_opts.$os
dst=$1/etc/spack/$os/packages.yaml

if [ "$(spack --version)" -gt "0.20.0" ]
then
sd="$(spack arch --platform)/"
else
sd=""
fi

dst=$1/etc/spack/${sd}${os}/packages.yaml

# packages to make not buildable
force_system='^(bdftopcf|damageproto|diffutils|expat|findutils|font-util|gdbm|gettext|libc|libfontenc|libice|libx11|libxau|libxcb|libxdamage|libxdmcp|libxext|libxfixes|libxfont|libxkbcommon|libxmu|libxpm|libxrandr|libxrender|libxshmfence|libxt|libxv|libxvmc|libxxf86vm|mesa-glu|mkfontdir|mkfontscale|openssl|pkg-config|pkgconf|tar|tcl|tk|xcb-util-(image|keysyms|renderutil|wm)|xextproto|xorg-server|xproto|xproxymanagementprotocol|xrandr|xtrans|zlib)$'
Expand Down
6 changes: 3 additions & 3 deletions bin/make_spack
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ bootstrap_spack() {
then
make_packages_yaml $SPACK_ROOT
else
if [ "$spack_release" -gt "v0.20.0" ]
if [ "$(spack --version)" -gt "0.20.0" ]
then
sd="linux"
sd="$(spack arch --platform)/"
else
sd=""
fi
cp $spackbindir/../templates/packages.yaml.${os} $SPACK_ROOT/etc/spack/$sd/${os}/packages.yaml
cp $spackbindir/../templates/packages.yaml.${os} $SPACK_ROOT/etc/spack/${sd}${os}/packages.yaml
fi
}

Expand Down

0 comments on commit 035fa01

Please sign in to comment.