Skip to content

Commit f94014e

Browse files
hercules / orion / ursa updates from release/1.9.0 (#1679)
Add changes from PR 1672 Fix openssl / tar for hercules / orion, openmpi prefix for ursa to develop branch
1 parent 0e130a6 commit f94014e

4 files changed

Lines changed: 33 additions & 21 deletions

File tree

configs/sites/tier1/hercules/packages.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,10 @@ packages:
7979
externals:
8080
- spec: m4@1.4.19
8181
prefix: /usr
82-
# Don't use, issues with py-cryptography
83-
#openssl:
84-
# externals:
85-
# - spec: openssl@3.0.1
86-
# prefix: /usr
82+
openssl:
83+
externals:
84+
- spec: openssl@3.0.1
85+
prefix: /usr
8786
pkgconf:
8887
externals:
8988
- spec: pkgconf@1.7.3
@@ -100,10 +99,10 @@ packages:
10099
externals:
101100
- spec: subversion@1.14.1
102101
prefix: /usr
103-
tar:
104-
externals:
105-
- spec: tar@1.34
106-
prefix: /usr
102+
#tar:
103+
# externals:
104+
# - spec: tar@1.34
105+
# prefix: /usr
107106
texinfo:
108107
externals:
109108
- spec: texinfo@6.7

configs/sites/tier1/orion/packages.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@ packages:
9090
externals:
9191
- spec: openssh@8.7p1
9292
prefix: /usr
93-
# Don't use, issues with py-cryptography
94-
#openssl:
95-
# externals:
96-
# - spec: openssl@3.0.1
97-
# prefix: /usr
93+
openssl:
94+
externals:
95+
- spec: openssl@3.0.1
96+
prefix: /usr
9897
perl:
9998
externals:
10099
- spec: perl@5.32.1~cpanm+opcode+open+shared+threads
@@ -115,10 +114,10 @@ packages:
115114
externals:
116115
- spec: subversion@1.14.1
117116
prefix: /usr
118-
tar:
119-
externals:
120-
- spec: tar@1.34
121-
prefix: /usr
117+
#tar:
118+
# externals:
119+
# - spec: tar@1.34
120+
# prefix: /usr
122121
wget:
123122
externals:
124123
- spec: wget@1.21.1

configs/sites/tier1/ursa/compilers.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,18 @@ compilers:
3131
modules: []
3232
environment: {}
3333
extra_rpaths: []
34+
35+
- compiler:
36+
spec: gcc@12.4.0
37+
paths:
38+
cc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc
39+
cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++
40+
f77: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
41+
fc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran
42+
flags: {}
43+
operating_system: rocky9
44+
target: x86_64
45+
modules:
46+
- gcc/12.4.0
47+
environment: {}
48+
extra_rpaths: []

configs/sites/tier1/ursa/packages_gcc.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
packages:
22
all:
3-
compiler:: [gcc@11.4.1]
3+
compiler:: [gcc@12.4.0]
44
providers:
55
mpi:: [openmpi@4.1.6]
66
mpi:
@@ -13,6 +13,5 @@ packages:
1313
- openmpi/4.1.6
1414
gcc-runtime:
1515
externals:
16-
- spec: gcc-runtime@11.4.1%gcc@11.4.1
16+
- spec: gcc-runtime@12.4.0%gcc@12.4.0
1717
prefix: /usr
18-

0 commit comments

Comments
 (0)