hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed for Python 2.6

Browse source
This commit is contained in:
Elizabeth F 2016-03-13 00:29:40 -05:00
parent 4236157823
commit c1a8574d8f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/package.py
View file

@ -831,7 +831,7 @@ def _resource_stage(self, resource):
def do_install(self, def do_install(self,
keep_prefix=False, keep_stage=False, ignore_deps=False, keep_prefix=False, keep_stage=False, ignore_deps=False,
skip_patch=False, verbose=False, make_jobs=None, fake=False, skip_patch=False, verbose=False, make_jobs=None, fake=False,
install_phases = {'configure', 'build', 'install', 'provenance'}): install_phases = set(['configure', 'build', 'install', 'provenance'])):
"""Called by commands to install a package and its dependencies. """Called by commands to install a package and its dependencies.
Package implementations should override install() to describe Package implementations should override install() to describe

9
var/spack/repos/builtin/packages/ibmisc/package.py
View file

@ -1,4 +1,5 @@
from spack import * from spack import *
import llnl.util.tty as tty
class Ibmisc(CMakePackage): class Ibmisc(CMakePackage):
"""Misc. reusable utilities used by IceBin.""" """Misc. reusable utilities used by IceBin."""
@ -15,7 +16,7 @@ class Ibmisc(CMakePackage):
variant('boost', default=True, description='Compile utilities for Boost library') variant('boost', default=True, description='Compile utilities for Boost library')
variant('udunits2', default=True, description='Compile utilities for UDUNITS2 library') variant('udunits2', default=True, description='Compile utilities for UDUNITS2 library')
variant('googletest', default=True, description='Compile utilities for Google Test library') variant('googletest', default=True, description='Compile utilities for Google Test library')
variant('python', default=True, description='Compile utilities for use with Python/Cython') variant('python', default=True, description='Compile utilities fro use with Python/Cython')
extends('python') extends('python')
@ -26,16 +27,18 @@ class Ibmisc(CMakePackage):
depends_on('netcdf-cxx4', when='+netcdf') depends_on('netcdf-cxx4', when='+netcdf')
depends_on('udunits2', when='+udunits2') depends_on('udunits2', when='+udunits2')
depends_on('googletest', when='+googletest') depends_on('googletest', when='+googletest')
# depends_on('python', when='+python')
depends_on('py-cython', when='+python') depends_on('py-cython', when='+python')
depends_on('py-numpy', when='+python') depends_on('py-numpy', when='+python')
depends_on('boost', when='+boost') depends_on('boost', when='+boost')
# Build dependencies # Build dependencies
depends_on('cmake') depends_on('cmake')
depends_on('doxygen') depends_on('doxygen')
def configure_args(self): def config_args(self, spec, prefix):
spec = self.spec
return [ return [
'-DUSE_EVERYTRACE=%s' % ('YES' if '+everytrace' in spec else 'NO'), '-DUSE_EVERYTRACE=%s' % ('YES' if '+everytrace' in spec else 'NO'),
'-DUSE_PROJ4=%s' % ('YES' if '+proj' in spec else 'NO'), '-DUSE_PROJ4=%s' % ('YES' if '+proj' in spec else 'NO'),