diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/clingo-bootstrap/package.py | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/clingo/package.py | 15 |
2 files changed, 26 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index 014ba12927..aeef40c4e1 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -9,6 +9,9 @@ import spack.compilers class ClingoBootstrap(Clingo): """Clingo with some options used for bootstrapping""" + + maintainers = ['alalazo'] + variant('build_type', default='Release', values=('Release',), description='CMake build type') @@ -41,6 +44,18 @@ class ClingoBootstrap(Clingo): # Clingo needs the Python module to be usable by Spack conflicts('~python', msg='Python support is required to bootstrap Spack') + @property + def cmake_py_shared(self): + return self.define('CLINGO_BUILD_PY_SHARED', 'OFF') + + def cmake_args(self): + args = super(ClingoBootstrap, self).cmake_args() + args.extend([ + # Avoid building the clingo executable + self.define('CLINGO_BUILD_APPS', 'OFF'), + ]) + return args + def setup_build_environment(self, env): if '%apple-clang platform=darwin' in self.spec: opts = '-mmacosx-version-min=10.13' diff --git a/var/spack/repos/builtin/packages/clingo/package.py b/var/spack/repos/builtin/packages/clingo/package.py index 2cce60aa38..2555fc3ebf 100644 --- a/var/spack/repos/builtin/packages/clingo/package.py +++ b/var/spack/repos/builtin/packages/clingo/package.py @@ -21,7 +21,7 @@ class Clingo(CMakePackage): url = "https://github.com/potassco/clingo/archive/v5.2.2.tar.gz" git = 'https://github.com/potassco/clingo.git' - maintainers = ["tgamblin"] + maintainers = ["tgamblin", "alalazo"] version('master', branch='master', submodules=True, preferred=True) version('spack', commit='2a025667090d71b2c9dce60fe924feb6bde8f667', submodules=True) @@ -56,10 +56,17 @@ class Clingo(CMakePackage): """Return standard CMake defines to ensure that the current spec is the one found by CMake find_package(Python, ...) """ + python_spec = self.spec['python'] + include_dir = python_spec.package.get_python_inc() return [ - '-DPython_EXECUTABLE={0}'.format(str(self.spec['python'].command)) + self.define('Python_EXECUTABLE', str(python_spec.command)), + self.define('Python_INCLUDE_DIR', include_dir) ] + @property + def cmake_py_shared(self): + return self.define('CLINGO_BUILD_PY_SHARED', 'ON') + def cmake_args(self): try: self.compiler.cxx14_flag @@ -69,10 +76,10 @@ class Clingo(CMakePackage): args = [ '-DCLINGO_REQUIRE_PYTHON=ON', '-DCLINGO_BUILD_WITH_PYTHON=ON', - '-DCLINGO_BUILD_PY_SHARED=ON', '-DPYCLINGO_USER_INSTALL=OFF', '-DPYCLINGO_USE_INSTALL_PREFIX=ON', - '-DCLINGO_BUILD_WITH_LUA=OFF' + '-DCLINGO_BUILD_WITH_LUA=OFF', + self.cmake_py_shared ] if self.spec['cmake'].satisfies('@3.16.0:'): args += self.cmake_python_hints |