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

added stat version 4.0.1 (#9607)

Browse Source 
* Add stat version 4.0.1
* stat 4.0.1: requires py-xdot
* stat versions at or above 4.0.0 dont require python 2 (it still
  requires python but can build with 2 or 3)
* stat versions at or above 4.0.0 dont require py-pygtk and py-enum34
* Replace py-xdot version 0.9.1 with 1.0
* py-xdot: use lib directory vs. lib64 for atk dependency
This commit is contained in:
Gregory Lee
2018-10-22 18:59:45 -07:00
committed by Peter Scheibel
parent 79e25032e8
commit e4a24c3fbc
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/py-xdot/package.py
View File

@@ -15,7 +15,7 @@ class PyXdot(PythonPackage):
git = "https://github.com/jrfonseca/xdot.py.git" git = "https://github.com/jrfonseca/xdot.py.git"
version('master', branch="master") version('master', branch="master")
version('0.9.1', commit="0fa629166989576b05d509c7ef0329c0f7655190") version('1.0', '4e60c42d009a8802db6c1b4dab519863')
version('0.9', '19c78311d73b0f9ea059a6febf42eeea') version('0.9', '19c78311d73b0f9ea059a6febf42eeea')
# setuptools is required at runtime to avoid: # setuptools is required at runtime to avoid:
@@ -34,7 +34,7 @@ def post_install(self):
spec = self.spec spec = self.spec
repo_paths = '%s:%s:%s:%s' % ( repo_paths = '%s:%s:%s:%s' % (
join_path(spec['pango'].prefix.lib, 'girepository-1.0'), join_path(spec['pango'].prefix.lib, 'girepository-1.0'),
join_path(spec['atk'].prefix.lib64, 'girepository-1.0'), join_path(spec['atk'].prefix.lib, 'girepository-1.0'),
join_path(spec['gdk-pixbuf'].prefix.lib, 'girepository-1.0'), join_path(spec['gdk-pixbuf'].prefix.lib, 'girepository-1.0'),
join_path(spec['gtkplus'].prefix.lib, 'girepository-1.0')) join_path(spec['gtkplus'].prefix.lib, 'girepository-1.0'))
dst = join_path(spec.prefix, spec['python'].package.site_packages_dir, dst = join_path(spec.prefix, spec['python'].package.site_packages_dir,
@@ -52,7 +52,7 @@ def setup_environment(self, spack_env, run_env):
join_path(spec['pango'].prefix.lib, join_path(spec['pango'].prefix.lib,
'girepository-1.0')) 'girepository-1.0'))
run_env.prepend_path('GI_TYPELIB_PATH', run_env.prepend_path('GI_TYPELIB_PATH',
join_path(spec['atk'].prefix.lib64, join_path(spec['atk'].prefix.lib,
'girepository-1.0')) 'girepository-1.0'))
run_env.prepend_path('GI_TYPELIB_PATH', run_env.prepend_path('GI_TYPELIB_PATH',
join_path(spec['gdk-pixbuf'].prefix.lib, join_path(spec['gdk-pixbuf'].prefix.lib,

9
var/spack/repos/builtin/packages/stat/package.py
View File

@@ -14,6 +14,8 @@ class Stat(AutotoolsPackage):
git = "https://github.com/llnl/stat.git" git = "https://github.com/llnl/stat.git"
version('develop', branch='develop') version('develop', branch='develop')
version('4.0.1', '3e21b48e7932d9a4a9efb300f0b97fa2',
url='https://github.com/LLNL/STAT/files/2489327/stat-4.0.1.tar.gz')
version('4.0.0', 'b357160662ced251bc55cb1b884c3407', version('4.0.0', 'b357160662ced251bc55cb1b884c3407',
url='https://github.com/LLNL/STAT/releases/download/v4.0.0/stat-4.0.0.tar.gz') url='https://github.com/LLNL/STAT/releases/download/v4.0.0/stat-4.0.0.tar.gz')
version('3.0.1', 'dac6f23c3639a0b21f923dc6219ba385', version('3.0.1', 'dac6f23c3639a0b21f923dc6219ba385',
@@ -40,9 +42,10 @@ class Stat(AutotoolsPackage):
depends_on('graphviz', type=('build', 'link', 'run')) depends_on('graphviz', type=('build', 'link', 'run'))
depends_on('launchmon') depends_on('launchmon')
depends_on('mrnet') depends_on('mrnet')
depends_on('python@:2.8') depends_on('python@:2.8', when='@:4.0.0')
depends_on('py-pygtk', type=('build', 'run')) depends_on('py-pygtk', type=('build', 'run'), when='@:4.0.0')
depends_on('py-enum34', type=('run')) depends_on('py-enum34', type=('run'), when='@:4.0.0')
depends_on('py-xdot', when='@4.0.1:')
depends_on('swig') depends_on('swig')
depends_on('mpi', when='+examples') depends_on('mpi', when='+examples')