Skip to content

Commit b654d40

Browse files
m-filahaampie
m-fila
and
haampie
authored
julia: add v1.12.5 (spack#2033)
Signed-off-by: Harmen Stoppels <harmenstoppels@gmail.com> Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
1 parent e081eba commit b654d40

1 file changed

Lines changed: 54 additions & 27 deletions

File tree

‎repos/spack_repo/builtin/packages/julia/package.py‎

Lines changed: 54 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class Julia(MakefilePackage):
2727
maintainers("vchuravy", "haampie", "giordano")
2828

2929
version("master", branch="master")
30+
version("1.12.5", sha256="9e0dee015ef631ce93ddcf8166a8f5f4cae39e923d8f38a54a832091d0475004")
31+
3032
version("1.11.9", sha256="3c73d9612ee5bbd9d73b9eee26937c970bea37f51dc24aa23fd4b232539eb7d8")
3133
version("1.11.8", sha256="c5b00ba80eb311dc90e8fe153348218efb5dc0632b6c47d138fe80e9c5ca037e")
3234
version("1.11.7", sha256="5378209de1c3da1a13d13fc74beffab984a998a77ae1a6a9901f27008da93c29")
@@ -90,11 +92,27 @@ class Julia(MakefilePackage):
9092
)
9193
depends_on("libuv-julia@1.42.0", when="@1.8.0:1.8.1")
9294
depends_on("libuv-julia@1.44.2", when="@1.8.2:1.9")
93-
depends_on("libuv-julia@1.44.3", when="@1.10.0:1.10")
94-
depends_on("libuv-julia@1.48.0", when="@1.11.0:")
95+
depends_on("libuv-julia@1.44.3", when="@1.10")
96+
depends_on("libuv-julia@1.48.0", when="@1.11")
97+
depends_on("libuv-julia@1.48.1rc1", when="@1.12:")
98+
9599
depends_on("suite-sparse@5.4:5.10", when="@:1.9")
96100

97-
with when("@1.11.0:1.11"):
101+
with when("@1.12"):
102+
# libssh2.so.1, libpcre2-8.so.0, libsll.so.3,
103+
# libopenlibm.so.4, libblastrampoline.so.5, libgit2.so.1.9, libnghttp2.so.14,
104+
# libcurl.so.4
105+
depends_on("libblastrampoline@5.13.1:5")
106+
depends_on("libgit2@1.9")
107+
depends_on("libssh2@1.11:1")
108+
depends_on("llvm@18.1.8 +lld shlib_symbol_version=JL_LLVM_18.0")
109+
depends_on("openssl@3.5.1:3.5")
110+
depends_on("openlibm@0.8.7:0.8", when="+openlibm")
111+
depends_on("nghttp2@1.64")
112+
depends_on("curl@8.11.1:")
113+
depends_on("suite-sparse@7.8.3")
114+
115+
with when("@1.11"):
98116
# libssh2.so.1, libpcre2-8.so.0, libmbedtls.so.14, libmbedcrypto.so.7, libmbedx509.so.1,
99117
# libopenlibm.so.4, libblastrampoline.so.5, libgit2.so.1.7, libnghttp2.so.14,
100118
# libcurl.so.4
@@ -104,11 +122,11 @@ class Julia(MakefilePackage):
104122
depends_on("llvm@16.0.6 +lld shlib_symbol_version=JL_LLVM_16.0")
105123
depends_on("mbedtls@2.28.2:2.28")
106124
depends_on("openlibm@0.8.1:0.8", when="+openlibm")
107-
depends_on("nghttp2@1.59.0:1.59")
125+
depends_on("nghttp2@1.59")
108126
depends_on("curl@8.6.0:")
109127
depends_on("suite-sparse@7.7.0")
110128

111-
with when("@1.10.0:1.10"):
129+
with when("@1.10"):
112130
# libssh2.so.1, libpcre2-8.so.0, libmbedtls.so.14, libmbedcrypto.so.7, libmbedx509.so.1,
113131
# libopenlibm.so.4, libblastrampoline.so.5, libgit2.so.1.6, libnghttp2.so.14,
114132
# libcurl.so.4
@@ -118,98 +136,106 @@ class Julia(MakefilePackage):
118136
depends_on("llvm@15.0.7 +lld shlib_symbol_version=JL_LLVM_15.0")
119137
depends_on("mbedtls@2.28.2:2.28")
120138
depends_on("openlibm@0.8.1:0.8", when="+openlibm")
121-
depends_on("nghttp2@1.52.0:1.52")
139+
depends_on("nghttp2@1.52")
122140
depends_on("curl@8.4.0:")
123141
depends_on("suite-sparse@7.2.1")
124142

125-
with when("@1.9.0:1.9"):
143+
with when("@1.9"):
126144
# libssh2.so.1, libpcre2-8.so.0, mbedtls.so.14, mbedcrypto.so.7, mbedx509.so.1
127145
# openlibm.so.4, libblastrampoline.so.5, libgit2.so.1.5, libnghttp2.so.14,
128146
# libcurl.so.4
129147
depends_on("libblastrampoline@5.4.0:5")
130148
depends_on("libgit2@1.5.0:1.5")
131149
depends_on("libssh2@1.10.0:1")
132150
depends_on("llvm@14.0.6 +lld shlib_symbol_version=JL_LLVM_14.0")
133-
depends_on("mbedtls@2.28.0:2.28")
151+
depends_on("mbedtls@2.28")
134152
depends_on("openlibm@0.8.1:0.8", when="+openlibm")
135-
depends_on("nghttp2@1.48.0:1.48")
153+
depends_on("nghttp2@1.48")
136154
depends_on("curl@7.84.0:")
137155

138-
with when("@1.8.0:1.8"):
156+
with when("@1.8"):
139157
# libssh2.so.1, libpcre2-8.so.0, mbedtls.so.14, mbedcrypto.so.7, mbedx509.so.1
140158
# openlibm.so.4, libblastrampoline.so.5, libgit2.so.1.3, libnghttp2.so.14,
141159
# libcurl.so.4
142160
depends_on("libblastrampoline@5.1.0:5")
143-
depends_on("libgit2@1.3.0:1.3")
161+
depends_on("libgit2@1.3")
144162
depends_on("libssh2@1.10.0:1")
145163
depends_on("llvm@13.0.1 shlib_symbol_version=JL_LLVM_13.0")
146-
depends_on("mbedtls@2.28.0:2.28")
164+
depends_on("mbedtls@2.28")
147165
depends_on("openlibm@0.8.1:0.8", when="+openlibm")
148-
depends_on("nghttp2@1.47.0:1.47")
166+
depends_on("nghttp2@1.47")
149167
depends_on("curl@7.84.0:")
150168

151169
# Patches for llvm
152170
depends_on(
153171
"llvm",
154-
when="^llvm@11.0.1",
172+
when="%llvm@11.0.1",
155173
patches=patch(
156174
"https://raw.githubusercontent.com/spack/patches/0b543955683a903d711a3e95ff29a4ce3951ca13/julia/llvm-11.0.1-julia-1.6.patch",
157175
sha256="8866ee0595272b826b72d173301a2e625855e80680a84af837f1ed6db4657f42",
158176
),
159177
)
160178
depends_on(
161179
"llvm",
162-
when="^llvm@12.0.1",
180+
when="%llvm@12.0.1",
163181
patches=patch(
164182
"https://raw.githubusercontent.com/spack/patches/24ff44c4c5439400747941473c0298a74c1fbcb1/julia/10cb42f80c2eaad3e9c87cb818b6676f1be26737bdf972c77392d71707386aa4.patch",
165183
sha256="10cb42f80c2eaad3e9c87cb818b6676f1be26737bdf972c77392d71707386aa4",
166184
),
167185
)
168186
depends_on(
169187
"llvm",
170-
when="^llvm@13.0.1",
188+
when="%llvm@13.0.1",
171189
patches=patch(
172190
"https://raw.githubusercontent.com/spack/patches/24ff44c4c5439400747941473c0298a74c1fbcb1/julia/45f72c59ae5cf45461e9cd8b224ca49b739d885c79b3786026433c6c22f83b5f.patch",
173191
sha256="45f72c59ae5cf45461e9cd8b224ca49b739d885c79b3786026433c6c22f83b5f",
174192
),
175193
)
176194
depends_on(
177195
"llvm",
178-
when="^llvm@14.0.6",
196+
when="%llvm@14.0.6",
179197
patches=patch(
180198
"https://raw.githubusercontent.com/spack/patches/24ff44c4c5439400747941473c0298a74c1fbcb1/julia/f3def26930832532bbcd861d41b31ae03db993bc2b3510f89ef831a30bd3e099.patch",
181199
sha256="f3def26930832532bbcd861d41b31ae03db993bc2b3510f89ef831a30bd3e099",
182200
),
183201
)
184202
depends_on(
185203
"llvm",
186-
when="^llvm@15.0.7",
204+
when="%llvm@15.0.7",
187205
patches=patch(
188206
"https://raw.githubusercontent.com/spack/patches/24ff44c4c5439400747941473c0298a74c1fbcb1/julia/25cdc0271e7722d4a7cc6f72abcb17bfe205fc741bbe3716a21759c3eee7d32c.patch",
189207
sha256="25cdc0271e7722d4a7cc6f72abcb17bfe205fc741bbe3716a21759c3eee7d32c",
190208
),
191209
)
192210
depends_on(
193211
"llvm",
194-
when="^llvm@16.0.6",
212+
when="%llvm@16.0.6",
195213
patches=patch(
196214
"https://raw.githubusercontent.com/spack/patches/d042ae8f41493547d4263d249a13546f2c971972/julia/4997cd3006a3171d9b33f9a72ff9fdadc84e91a7c86aa044dcf495eef3a02893.patch",
197215
sha256="4997cd3006a3171d9b33f9a72ff9fdadc84e91a7c86aa044dcf495eef3a02893",
198216
),
199217
)
218+
depends_on(
219+
"llvm",
220+
when="%llvm@18.1.8",
221+
patches=patch(
222+
"https://raw.githubusercontent.com/spack/patches/4d9ce09c4793f4899a588741fdc459530e26b313/julia/900363d08b2090bb44240aa33c1ee26558a183016db4fb7e048be4c1665c436e.patch",
223+
sha256="900363d08b2090bb44240aa33c1ee26558a183016db4fb7e048be4c1665c436e",
224+
),
225+
)
200226

201227
# Patches for libuv
202228
depends_on(
203229
"libuv",
204-
when="^libuv@1.39.0",
230+
when="%libuv@1.39.0",
205231
patches=patch(
206232
"https://raw.githubusercontent.com/spack/patches/b59ca193423c4c388254f528afabb906b5373162/julia/libuv-1.39.0.patch",
207233
sha256="f7c1e7341e89dc35dfd85435ba35833beaef575b997c3f978c27d0dbf805149b",
208234
),
209235
)
210236
depends_on(
211237
"libuv",
212-
when="^libuv@1.42.0",
238+
when="%libuv@1.42.0",
213239
patches=patch(
214240
"https://raw.githubusercontent.com/spack/patches/89b6d14eb1f3c3d458a06f1e06f7dda3ab67bd38/julia/libuv-1.42.0.patch",
215241
sha256="d9252fbe67ac8f15e15653f0f6b00dffa07ae1a42f013d4329d17d8b492b7cdb",
@@ -244,7 +270,7 @@ class Julia(MakefilePackage):
244270
depends_on("unwind")
245271
depends_on("utf8proc")
246272
depends_on("zlib-api")
247-
depends_on("zlib +shared +pic +optimize", when="^[virtuals=zlib-api] zlib")
273+
depends_on("zlib +shared +pic +optimize", when="%[virtuals=zlib-api] zlib")
248274

249275
# Patches for julia
250276
patch("use-add-rpath.patch", when="@:1.8.0")
@@ -286,7 +312,7 @@ class Julia(MakefilePackage):
286312
name="downloads-patch-1",
287313
placement="downloads-patch-1",
288314
expand=False,
289-
when="@:1.11 ^curl@8.10:",
315+
when="@:1.11 %curl@8.10:",
290316
)
291317

292318
resource(
@@ -295,7 +321,7 @@ class Julia(MakefilePackage):
295321
name="downloads-jl-patch-2",
296322
placement="downloads-patch-2",
297323
expand=False,
298-
when="@:1.11 ^curl@8.10:",
324+
when="@:1.11 %curl@8.10:",
299325
)
300326

301327
def patch(self):
@@ -353,7 +379,7 @@ def edit(self, spec, prefix):
353379
if julia_cpu_target == "auto":
354380
julia_cpu_target = get_best_target(spec.target, "clang", spec["llvm"].version)
355381

356-
libuv = "libuv-julia" if "^libuv-julia" in spec else "libuv"
382+
libuv = "libuv-julia" if "%libuv-julia" in spec else "libuv"
357383

358384
options = [
359385
"prefix:={0}".format(prefix),
@@ -377,7 +403,8 @@ def edit(self, spec, prefix):
377403
"USE_SYSTEM_LIBWHICH:=1",
378404
"USE_SYSTEM_LLD:=1", # @1.9:
379405
"USE_SYSTEM_LLVM:=1",
380-
"USE_SYSTEM_MBEDTLS:=1",
406+
"USE_SYSTEM_MBEDTLS:=1", # @:1.11
407+
"USE_SYSTEM_OPENSSL:=1", # @1.12:
381408
"USE_SYSTEM_MPFR:=1",
382409
"USE_SYSTEM_P7ZIP:=1",
383410
"USE_SYSTEM_PATCHELF:=1",
@@ -421,7 +448,7 @@ def edit(self, spec, prefix):
421448
with open("Make.user", "w") as f:
422449
f.write("\n".join(options) + "\n")
423450

424-
@run_before("build", when="@:1.11 ^curl@8.10:")
451+
@run_before("build", when="@:1.11 %curl@8.10:")
425452
def patch_downloads_stdlib(self):
426453
# stdlibs are distributed as tarballs, which we need to unpack so we can patch Downloads.jl
427454
# making it forward compatible with curl.

0 commit comments

Comments
 (0)