zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #168 from mathstuf/libxml2-drop-python-dep

Browse Source 
Libxml2 drop python dep
This commit is contained in:
Todd Gamblin 2015-11-23 16:08:24 -08:00
commit b5fffc71c9
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/packages/libxml2/package.py
View File

@ -9,13 +9,20 @@ class Libxml2(Package):
version('2.9.2', '9e6a9aca9d155737868b3dc5fd82f788') version('2.9.2', '9e6a9aca9d155737868b3dc5fd82f788')
extends('python') variant('python', default=False, description='Enable Python support')
extends('python', when='+python')
depends_on('zlib') depends_on('zlib')
depends_on('xz') depends_on('xz')
def install(self, spec, prefix): def install(self, spec, prefix):
configure("--prefix=%s" % prefix, if '+python' in spec:
"--with-python=%s" % spec['python'].prefix) python_arg = "--with-python=%s" % spec['python'].prefix
else:
python_arg = "--without-python"
configure("--prefix=%s" % prefix,
python_arg)
make() make()
make("install") make("install")

4
var/spack/packages/paraview/package.py
View File

@ -28,7 +28,7 @@ class Paraview(Package):
depends_on('jpeg') depends_on('jpeg')
depends_on('libpng') depends_on('libpng')
depends_on('libtiff') depends_on('libtiff')
#depends_on('libxml2') # drags in python depends_on('libxml2')
depends_on('netcdf') depends_on('netcdf')
#depends_on('protobuf') # version mismatches? #depends_on('protobuf') # version mismatches?
#depends_on('sqlite') # external version not supported #depends_on('sqlite') # external version not supported
@ -65,7 +65,7 @@ def nfeature_to_bool(feature):
'-DVTK_USER_SYSTEM_FREETYPE:BOOL=ON', '-DVTK_USER_SYSTEM_FREETYPE:BOOL=ON',
'-DVTK_USER_SYSTEM_HDF5:BOOL=ON', '-DVTK_USER_SYSTEM_HDF5:BOOL=ON',
'-DVTK_USER_SYSTEM_JPEG: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_NETCDF:BOOL=ON',
'-DVTK_USER_SYSTEM_TIFF:BOOL=ON', '-DVTK_USER_SYSTEM_TIFF:BOOL=ON',
'-DVTK_USER_SYSTEM_ZLIB:BOOL=ON', '-DVTK_USER_SYSTEM_ZLIB:BOOL=ON',