summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/mapnik/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-python-mapnik/package.py6
2 files changed, 7 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/mapnik/package.py b/var/spack/repos/builtin/packages/mapnik/package.py
index de3e1ffb90..0e0e2ee187 100644
--- a/var/spack/repos/builtin/packages/mapnik/package.py
+++ b/var/spack/repos/builtin/packages/mapnik/package.py
@@ -29,7 +29,7 @@ class Mapnik(AutotoolsPackage):
depends_on('libjpeg')
depends_on('libtiff')
depends_on('proj')
- depends_on('cairo')
+ depends_on('cairo+pdf') # +pdf needed for mapnik.printing
depends_on('postgresql', type=('build', 'link', 'run'))
depends_on('gdal', type=('build', 'link', 'run'))
depends_on('sqlite+rtree', type=('build', 'link', 'run'))
@@ -37,9 +37,9 @@ class Mapnik(AutotoolsPackage):
conflicts('%gcc@9.0.0:')
- def setup_environment(self, spack_env, run_env):
+ def setup_build_environment(self, env):
spec = self.spec
- spack_env.set('GDAL_DATA', spec['gdal'].prefix.share.gdal)
+ env.set('GDAL_DATA', spec['gdal'].prefix.share.gdal)
def configure_args(self):
return [
diff --git a/var/spack/repos/builtin/packages/py-python-mapnik/package.py b/var/spack/repos/builtin/packages/py-python-mapnik/package.py
index 6d1cf944b0..4d2a405f6f 100644
--- a/var/spack/repos/builtin/packages/py-python-mapnik/package.py
+++ b/var/spack/repos/builtin/packages/py-python-mapnik/package.py
@@ -20,10 +20,12 @@ class PyPythonMapnik(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('mapnik', type=('build', 'link', 'run'))
depends_on('boost +python+thread')
+ # py-pycairo is need by mapnik.printing
+ depends_on('py-pycairo', type=('build', 'run'))
# Package can't find boost_python without the following
- def setup_environment(self, spack_env, run_env):
+ def setup_build_environment(self, env):
# Inform the package that boost python library is of form
# 'libboost_python27.so' as opposed to 'libboost_python.so'
py_ver = str(self.spec['python'].version.up_to(2).joined)
- spack_env.set('BOOST_PYTHON_LIB', 'boost_python' + py_ver)
+ env.set('BOOST_PYTHON_LIB', 'boost_python' + py_ver)