summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-11-23 16:08:24 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2015-11-23 16:08:24 -0800
commitb5fffc71c94f3d1b8c3ea8673506349c32b35f1c (patch)
tree3beecea12c6485609c6f67717f016f1477fd01fb
parent0011903e23d344723d6146c50ff73ab569731a4e (diff)
parent45d981caab32024b6d05909f777abd257777ddb7 (diff)
downloadspack-b5fffc71c94f3d1b8c3ea8673506349c32b35f1c.tar.gz
spack-b5fffc71c94f3d1b8c3ea8673506349c32b35f1c.tar.bz2
spack-b5fffc71c94f3d1b8c3ea8673506349c32b35f1c.tar.xz
spack-b5fffc71c94f3d1b8c3ea8673506349c32b35f1c.zip
Merge pull request #168 from mathstuf/libxml2-drop-python-dep
Libxml2 drop python dep
-rw-r--r--var/spack/packages/libxml2/package.py13
-rw-r--r--var/spack/packages/paraview/package.py4
2 files changed, 12 insertions, 5 deletions
diff --git a/var/spack/packages/libxml2/package.py b/var/spack/packages/libxml2/package.py
index df311bfaba..5d84fad22d 100644
--- a/var/spack/packages/libxml2/package.py
+++ b/var/spack/packages/libxml2/package.py
@@ -9,13 +9,20 @@ class Libxml2(Package):
version('2.9.2', '9e6a9aca9d155737868b3dc5fd82f788')
- extends('python')
+ variant('python', default=False, description='Enable Python support')
+
+ extends('python', when='+python')
depends_on('zlib')
depends_on('xz')
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix,
- "--with-python=%s" % spec['python'].prefix)
+ if '+python' in spec:
+ python_arg = "--with-python=%s" % spec['python'].prefix
+ else:
+ python_arg = "--without-python"
+
+ configure("--prefix=%s" % prefix,
+ python_arg)
make()
make("install")
diff --git a/var/spack/packages/paraview/package.py b/var/spack/packages/paraview/package.py
index 447376a376..b0893237e9 100644
--- a/var/spack/packages/paraview/package.py
+++ b/var/spack/packages/paraview/package.py
@@ -28,7 +28,7 @@ class Paraview(Package):
depends_on('jpeg')
depends_on('libpng')
depends_on('libtiff')
- #depends_on('libxml2') # drags in python
+ depends_on('libxml2')
depends_on('netcdf')
#depends_on('protobuf') # version mismatches?
#depends_on('sqlite') # external version not supported
@@ -65,7 +65,7 @@ class Paraview(Package):
'-DVTK_USER_SYSTEM_FREETYPE:BOOL=ON',
'-DVTK_USER_SYSTEM_HDF5:BOOL=ON',
'-DVTK_USER_SYSTEM_JPEG:BOOL=ON',
- #'-DVTK_USER_SYSTEM_LIBXML2:BOOL=ON',
+ '-DVTK_USER_SYSTEM_LIBXML2:BOOL=ON',
'-DVTK_USER_SYSTEM_NETCDF:BOOL=ON',
'-DVTK_USER_SYSTEM_TIFF:BOOL=ON',
'-DVTK_USER_SYSTEM_ZLIB:BOOL=ON',