summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Underwood <robertu94@users.noreply.github.com>2023-03-02 10:36:55 -0500
committerGitHub <noreply@github.com>2023-03-02 16:36:55 +0100
commit07c89396796c49f235eb3281f650c80032f348ee (patch)
tree9d6d3481c7d27bb04228dd8af056b51c9ff53ddf
parent28f4b5729a4546faedaedf9e86a6ab181f6a8de6 (diff)
downloadspack-07c89396796c49f235eb3281f650c80032f348ee.tar.gz
spack-07c89396796c49f235eb3281f650c80032f348ee.tar.bz2
spack-07c89396796c49f235eb3281f650c80032f348ee.tar.xz
spack-07c89396796c49f235eb3281f650c80032f348ee.zip
julia: fix for libuv and Julia (#35776)
Use correct `shlib_symbol_version` for Julia 1.8, work around issue where libuv-julia's git checkout has arbitrary mtime, causing make to regenerate configure scripts, sometimes.
-rw-r--r--var/spack/repos/builtin/packages/julia/package.py2
-rw-r--r--var/spack/repos/builtin/packages/libuv-julia/package.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 450e713f96..3eab5eb47c 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -63,7 +63,7 @@ class Julia(MakefilePackage):
depends_on("libblastrampoline@5.1.0:5")
depends_on("libgit2@1.3.0:1.3")
depends_on("libssh2@1.10.0:1.10")
- depends_on("llvm@13.0.1 shlib_symbol_version=jl")
+ depends_on("llvm@13.0.1 shlib_symbol_version=JL_LLVM_13.0")
depends_on("mbedtls@2.28.0:2.28")
depends_on("openlibm@0.8.1:0.8", when="+openlibm")
depends_on("nghttp2@1.47.0:1.47")
diff --git a/var/spack/repos/builtin/packages/libuv-julia/package.py b/var/spack/repos/builtin/packages/libuv-julia/package.py
index c1ce5ba69a..f9e2c75af8 100644
--- a/var/spack/repos/builtin/packages/libuv-julia/package.py
+++ b/var/spack/repos/builtin/packages/libuv-julia/package.py
@@ -18,6 +18,13 @@ class LibuvJulia(AutotoolsPackage):
version("1.44.1", commit="1b2d16477fe1142adea952168d828a066e03ee4c")
version("1.42.0", commit="3a63bf71de62c64097989254e4f03212e3bf5fc8")
+ def autoreconf(self, spec, prefix):
+ # @haampie: Configure files are checked in, but git does not restore mtime
+ # by design. Therefore, touch files to avoid regenerating those.
+ touch("aclocal.m4")
+ touch("Makefile.in")
+ touch("configure")
+
@property
def libs(self):
return find_libraries(["libuv"], root=self.prefix, recursive=True, shared=False)