diff options
| author | Richard Berger <rberger@lanl.gov> | 2024-03-20 03:22:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 03:22:58 -0600 |
| commit | eb11fa7d184d48c4593d48f76a52d7b26e5ef272 (patch) | |
| tree | b72c43da0004cb75492683d4370c6098c0e5a287 | |
| parent | 4d8381a7758fad50bf71af9b23ddab68d91f2c57 (diff) | |
| download | spack-eb11fa7d184d48c4593d48f76a52d7b26e5ef272.tar.gz spack-eb11fa7d184d48c4593d48f76a52d7b26e5ef272.tar.bz2 spack-eb11fa7d184d48c4593d48f76a52d7b26e5ef272.tar.xz spack-eb11fa7d184d48c4593d48f76a52d7b26e5ef272.zip | |
lua-sol2: merge duplicate sol2 package into it (#43155)
| -rw-r--r-- | var/spack/repos/builtin/packages/lua-sol2/package.py | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sol2/package.py | 29 |
2 files changed, 11 insertions, 31 deletions
diff --git a/var/spack/repos/builtin/packages/lua-sol2/package.py b/var/spack/repos/builtin/packages/lua-sol2/package.py index 50134e380e..6b07a6b3ed 100644 --- a/var/spack/repos/builtin/packages/lua-sol2/package.py +++ b/var/spack/repos/builtin/packages/lua-sol2/package.py @@ -9,11 +9,16 @@ from spack.package import * class LuaSol2(CMakePackage): """sol2 is a C++ library binding to Lua.""" - homepage = "https://github.com/ThePhD/sol2" + homepage = "https://sol2.rtfd.io" url = "https://github.com/ThePhD/sol2/archive/refs/tags/v3.2.2.tar.gz" git = "https://github.com/ThePhD/sol2.git" + maintainers("rbberger") + + license("MIT") + version("develop", branch="develop") + version("3.3.0", tag="v3.3.0", commit="eba86625b707e3c8c99bbfc4624e51f42dc9e561") version("3.2.3", sha256="f74158f92996f476786be9c9e83f8275129bb1da2a8d517d050421ac160a4b9e") version("3.2.2", sha256="141790dae0c1821dd2dbac3595433de49ba72545845efc3ec7d88de8b0a3b2da") version("3.2.1", sha256="b10f88dc1246f74a10348faef7d2c06e2784693307df74dcd87c4641cf6a6828") @@ -25,5 +30,9 @@ class LuaSol2(CMakePackage): depends_on("lua", type=("link", "run")) def cmake_args(self): - args = ["-DSOL2_ENABLE_INSTALL=ON"] + args = [ + self.define("SOL2_ENABLE_INSTALL", True), + self.define("SOL2_BUILD_LUA", False), + self.define("SOL2_LUA_VERSION", self.spec["lua"].version), + ] return args diff --git a/var/spack/repos/builtin/packages/sol2/package.py b/var/spack/repos/builtin/packages/sol2/package.py deleted file mode 100644 index 43008694aa..0000000000 --- a/var/spack/repos/builtin/packages/sol2/package.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Sol2(CMakePackage): - """A fast, simple C++ and Lua Binding""" - - homepage = "https://sol2.rtfd.io" - git = "https://github.com/ThePhD/sol2.git" - - maintainers("rbberger") - - license("MIT") - - version("develop", branch="develop") - version("3.3.0", tag="v3.3.0", commit="eba86625b707e3c8c99bbfc4624e51f42dc9e561") - - depends_on("lua") - - def cmake_args(self): - args = [ - self.define("SOL2_BUILD_LUA", False), - self.define("SOL2_LUA_VERSION", self.spec["lua"].version), - ] - return args |