diff options
| author | Alberto Invernizzi <9337627+albestro@users.noreply.github.com> | 2023-10-26 11:33:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 03:33:27 -0600 |
| commit | bf88ed45da1554bd55436780846623ba1afeb3a6 (patch) | |
| tree | 97de99cbe7f7b536953c9eaeceec275ddfc4fd67 | |
| parent | b4cf3d9f18ea79e378de57a527898968b0fd6baa (diff) | |
| download | spack-bf88ed45da1554bd55436780846623ba1afeb3a6.tar.gz spack-bf88ed45da1554bd55436780846623ba1afeb3a6.tar.bz2 spack-bf88ed45da1554bd55436780846623ba1afeb3a6.tar.xz spack-bf88ed45da1554bd55436780846623ba1afeb3a6.zip | |
libluv: require CMake 3 and CMP0042 (#40716)
| -rw-r--r-- | var/spack/repos/builtin/packages/libluv/package.py | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/neovim/package.py | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/libluv/package.py b/var/spack/repos/builtin/packages/libluv/package.py index b3600f63ce..ff9a9db5e6 100644 --- a/var/spack/repos/builtin/packages/libluv/package.py +++ b/var/spack/repos/builtin/packages/libluv/package.py @@ -22,11 +22,18 @@ class Libluv(CMakePackage): version("1.42.0-0", sha256="b5228a9d0eaacd9f862b6270c732d5c90773a28ce53b6d9e32a14050e7947f36") version("1.36.0-0", sha256="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445") + # https://github.com/neovim/neovim/issues/25770 + # up to 1.45 (included) dynamic library on macOS did not have the @rpath prefix, being not + # usable on this platform. + # from 1.46, by requiring a newer cmake version, CMP0042 is in place and it works correctly. + depends_on("cmake@3:", type="build") + depends_on("lua-lang", type="link") depends_on("libuv", type="link") def cmake_args(self): args = [ + self.define("CMAKE_POLICY_DEFAULT_CMP0042", "NEW"), "-DLUA_BUILD_TYPE=System", "-DBUILD_STATIC_LIBS=ON", "-DBUILD_SHARED_LIBS=ON", diff --git a/var/spack/repos/builtin/packages/neovim/package.py b/var/spack/repos/builtin/packages/neovim/package.py index 36069fa76b..ff59c4f539 100644 --- a/var/spack/repos/builtin/packages/neovim/package.py +++ b/var/spack/repos/builtin/packages/neovim/package.py @@ -140,9 +140,6 @@ class Neovim(CMakePackage): # https://github.com/neovim/neovim/issues/16217#issuecomment-958590493 conflicts("libvterm@0.2:", when="@:0.7") - # https://github.com/neovim/neovim/issues/25770 - conflicts("libluv@1.44:", when="platform=darwin") - @when("^lua") def cmake_args(self): return [self.define("PREFER_LUA", True)] |