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

flux: update flux-core to v0.8.0 (#5914)

Browse source 
* dockbook: remove update to dependent environment

Remove override of setup_dependent_environment in both docbook-xml
and docbook-xsl, which seems to generate a warning from spack about
"Suspicious requests to set or unset 'XML_CATLOG_FILES' found."

* flux: update version/dependencies to 0.8.0

Update flux-core to v0.8.0. Clean up dependencies and remove unneeded
extra invocation of ./autogen.sh when building from @master.

* flux: modify environment for Lua tests

Modify Spack environment to add `./?.lua` to LUA_PATH so that
fluxometer.lua can be found by tests during `make check` run
from `spack install --tests all flux`

* flux: fix broken flux version when on master

When building @master with spack, the flux version test from
`make check` fails because spack is using a shallow clone. Add
a setup section for @master that calls git pull --depth=50 --tags
to pull down tags and (hopefully) enough information for git-describe
to work properly.
This commit is contained in:
Mark Grondona 2017-11-01 08:53:37 -07:00 committed by Todd Gamblin
parent 445ffc46a1
commit 165e6bfe5f
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/docbook-xml/package.py
View file

@ -42,10 +42,6 @@ def install(self, spec, prefix):
else:
install(src, dst)
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
catalog = os.path.join(self.spec.prefix, 'catalog.xml')
spack_env.set('XML_CATALOG_FILES', catalog, separator=' ')
def setup_environment(self, spack_env, run_env):
catalog = os.path.join(self.spec.prefix, 'catalog.xml')
run_env.set('XML_CATALOG_FILES', catalog, separator=' ')

4
var/spack/repos/builtin/packages/docbook-xsl/package.py
View file

@ -44,10 +44,6 @@ def install(self, spec, prefix):
else:
install(src, dst)
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
catalog = os.path.join(self.spec.prefix, 'catalog.xml')
spack_env.set('XML_CATALOG_FILES', catalog, separator=' ')
def setup_environment(self, spack_env, run_env):
catalog = os.path.join(self.spec.prefix, 'catalog.xml')
run_env.set('XML_CATALOG_FILES', catalog, separator=' ')

25
var/spack/repos/builtin/packages/flux/package.py
View file

@ -30,38 +30,51 @@ class Flux(AutotoolsPackage):
""" A next-generation resource manager (pre-alpha) """
homepage = "https://github.com/flux-framework/flux-core"
url = "https://github.com/flux-framework/flux-core/releases/download/v0.6.0/flux-core-0.6.0.tar.gz"
url = "https://github.com/flux-framework/flux-core/releases/download/v0.8.0/flux-core-0.8.0.tar.gz"
version('0.6.0', md5='d44a0f719744771d168edd205bd8e74e')
version('0.8.0', md5='9ee12974a8b2ab9a30533f69826f3bec')
version('master', branch='master',
git='https://github.com/flux-framework/flux-core')
variant('docs', default=True, description='Build flux manpages')
# Also needs autotools, but should use the system version if available
depends_on("zeromq@4.0.4:")
depends_on("czmq@2.2:")
depends_on("hwloc")
depends_on("lua@5.1:5.1.99")
depends_on("lua-luaposix")
depends_on("munge")
depends_on("json-c")
depends_on("libxslt")
depends_on("libuuid")
depends_on("python")
depends_on("py-cffi", type=('build', 'run'))
depends_on("jansson")
depends_on("asciidoc", type='build', when="+docs")
# Need autotools when building on master:
depends_on("autoconf", type='build', when='@master')
depends_on("automake", type='build', when='@master')
depends_on("libtool", type='build', when='@master')
def setup():
pass
@when('@master')
def setup(self):
# Allow git-describe to get last tag so flux-version works:
git = which('git')
git('pull', '--depth=50', '--tags')
def autoreconf(self, spec, prefix):
self.setup()
if os.path.exists('autogen.sh'):
# Bootstrap with autotools
bash = which('bash')
bash('./autogen.sh')
bash('./autogen.sh') # yes, twice, intentionally
def setup_environment(self, spack_env, run_env):
# Ensure ./fluxometer.lua can be found during flux's make check
spack_env.append_path('LUA_PATH', './?.lua', separator=';')
def configure_args(self):
return ['--disable-docs'] if '+docs' not in self.spec else []