diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-04-14 09:43:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 09:43:59 +0200 |
| commit | 92144d637560a7442ce9811a1c7492e19dd38156 (patch) | |
| tree | b962261b96b86b10609d69b6a2c7c65ee15dcc70 /var | |
| parent | 0c2aafec33fbd3418dc731c987f43573a7610439 (diff) | |
| download | spack-92144d637560a7442ce9811a1c7492e19dd38156.tar.gz spack-92144d637560a7442ce9811a1c7492e19dd38156.tar.bz2 spack-92144d637560a7442ce9811a1c7492e19dd38156.tar.xz spack-92144d637560a7442ce9811a1c7492e19dd38156.zip | |
lz4: fix bug on darwin, use makefile by default (#36820)
Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/lz4/package.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py index ff461f37dd..73139c7a11 100644 --- a/var/spack/repos/builtin/packages/lz4/package.py +++ b/var/spack/repos/builtin/packages/lz4/package.py @@ -31,7 +31,7 @@ class Lz4(CMakePackage, MakefilePackage): depends_on("valgrind", type="test") - build_system("cmake", "makefile", default="cmake") + build_system("cmake", "makefile", default="makefile") parallel = False if sys.platform == "win32" else True variant( "libs", @@ -56,11 +56,6 @@ class Lz4(CMakePackage, MakefilePackage): filter_file("-fvisibility=hidden", "", "lib/Makefile") filter_file("-pedantic", "", "Makefile") - @run_after("install") - def darwin_fix(self): - if sys.platform == "darwin": - fix_darwin_install_name(self.prefix.lib) - class CMakeBuilder(CMakeBuilder): @property @@ -68,7 +63,7 @@ class CMakeBuilder(CMakeBuilder): return os.path.join(super().root_cmakelists_dir, "build", "cmake") def cmake_args(self): - args = [] + args = [self.define("CMAKE_POLICY_DEFAULT_CMP0042", "NEW")] # # no pic on windows if "platform=windows" in self.spec: args.append(self.define("LZ4_POSITION_INDEPENDENT_LIB", False)) @@ -101,3 +96,7 @@ class MakefileBuilder(MakefileBuilder): "BUILD_SHARED={0}".format("yes" if "libs=shared" in self.spec else "no"), "BUILD_STATIC={0}".format("yes" if "libs=static" in self.spec else "no"), ) + + @run_after("install", when="platform=darwin") + def darwin_fix(self): + fix_darwin_install_name(self.prefix.lib) |