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

Merge pull request #432 from RemoteConnectionManager/paraview_fix

Browse Source 
Paraview fix
This commit is contained in:
Todd Gamblin
2016-02-10 13:59:08 -08:00
parent e23c260cb0 d7b3ed08ab
commit bcf705b85e
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/build_environment.py
View File

@@ -237,9 +237,9 @@ def set_module_variables_for_package(pkg, m):
def get_rpaths(pkg): def get_rpaths(pkg):
"""Get a list of all the rpaths for a package.""" """Get a list of all the rpaths for a package."""
rpaths = [pkg.prefix.lib, pkg.prefix.lib64] rpaths = [pkg.prefix.lib, pkg.prefix.lib64]
rpaths.extend(d.prefix.lib for d in pkg.spec.traverse(root=False) rpaths.extend(d.prefix.lib for d in pkg.spec.dependencies.values()
if os.path.isdir(d.prefix.lib)) if os.path.isdir(d.prefix.lib))
rpaths.extend(d.prefix.lib64 for d in pkg.spec.traverse(root=False) rpaths.extend(d.prefix.lib64 for d in pkg.spec.dependencies.values()
if os.path.isdir(d.prefix.lib64)) if os.path.isdir(d.prefix.lib64))
return rpaths return rpaths

2
var/spack/repos/builtin/packages/netcdf/package.py
View File

@@ -9,7 +9,7 @@ class Netcdf(Package):
homepage = "http://www.unidata.ucar.edu/software/netcdf/" homepage = "http://www.unidata.ucar.edu/software/netcdf/"
url = "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz" url = "ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.3.3.tar.gz"
version('4.4.0', 'f01cb26a0126dd9a6224e76472d25f6c') version('4.4.0', 'cffda0cbd97fdb3a06e9274f7aef438e')
version('4.3.3', '5fbd0e108a54bd82cb5702a73f56d2ae') version('4.3.3', '5fbd0e108a54bd82cb5702a73f56d2ae')
variant('mpi', default=True, description='Enables MPI parallelism') variant('mpi', default=True, description='Enables MPI parallelism')

1
var/spack/repos/builtin/packages/paraview/package.py
View File

@@ -14,6 +14,7 @@ class Paraview(Package):
variant('osmesa', default=False, description='Enable OSMesa support') variant('osmesa', default=False, description='Enable OSMesa support')
variant('qt', default=False, description='Enable Qt support') variant('qt', default=False, description='Enable Qt support')
variant('opengl2', default=False, description='Enable OPengl2 backend')
depends_on('python', when='+python') depends_on('python', when='+python')
depends_on('py-numpy', when='+python') depends_on('py-numpy', when='+python')

2
var/spack/repos/builtin/packages/qhull/package.py
View File

@@ -20,6 +20,8 @@ class Qhull(Package):
# https://github.com/qhull/qhull/pull/5 # https://github.com/qhull/qhull/pull/5
patch('qhull-iterator.patch', when='@1.0') patch('qhull-iterator.patch', when='@1.0')
depends_on('cmake')
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):

3
var/spack/repos/builtin/packages/qt/package.py
View File

@@ -23,6 +23,7 @@ class Qt(Package):
version('3.3.8b', '9f05b4125cfe477cc52c9742c3c09009', version('3.3.8b', '9f05b4125cfe477cc52c9742c3c09009',
url="http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8b.tar.gz") url="http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8b.tar.gz")
variant('mesa', default=False, description='depend on mesa')
# Add patch for compile issues with qt3 found with use in the OpenSpeedShop project # Add patch for compile issues with qt3 found with use in the OpenSpeedShop project
variant('krellpatch', default=False, description="build with openspeedshop based patch.") variant('krellpatch', default=False, description="build with openspeedshop based patch.")
patch('qt3krell.patch', when='@3.3.8b+krellpatch') patch('qt3krell.patch', when='@3.3.8b+krellpatch')
@@ -48,7 +49,7 @@ class Qt(Package):
# depends_on("icu4c") # depends_on("icu4c")
# OpenGL hardware acceleration # OpenGL hardware acceleration
depends_on("mesa", when='@4:') depends_on("mesa", when='@4:+mesa')
depends_on("libxcb") depends_on("libxcb")