Cleanup some depends_on flex for scotch and things depending on scotch (#4600) (#4601)

- The buggy flex-2.6.2 was blacklisted in the corresponding flex
  package, but now also removed the md5sum to avoid suggesting that
  this version should be revived.
  The 2.6.3 has similar problems (at least for scotch), but 2.6.4
  seems to work.

- Rejig flex restriction for scotch to exclude 2.6.2-2.6.3 only. Since
  flex-2.6.4 appears to be okay again, we can remove the flex version
  restriction that trickled through into the openfoam packages as a
  consequent of an spack spec bug.

- Make flex a build dependency for the openfoam packages
  (seems to have been an earlier oversight).
This commit is contained in:
Mark Olesen 2017-06-26 15:58:02 +01:00 committed by Adam J. Stewart
parent ad1382e664
commit 767cdf98d3
5 changed files with 6 additions and 6 deletions

View file

@ -34,9 +34,8 @@ class Flex(AutotoolsPackage):
version('2.6.4', '2882e3179748cc9f9c23ec593d6adc8d')
version('2.6.3', 'a5f65570cd9107ec8a8ec88f17b31bb1')
# Problematic version:
# Avoid flex '2.6.2' (major bug)
# See issue #2554; https://github.com/westes/flex/issues/113
# version('2.6.2', 'cc6d76c333db7653d5caf423a3335239')
version('2.6.1', '05bcd8fb629e0ae130311e8a6106fa82')
version('2.6.0', '760be2ee9433e822b6eb65318311c19d')
version('2.5.39', '5865e76ac69c05699f476515592750d7')

View file

@ -100,7 +100,7 @@ class FoamExtend(Package):
depends_on('mpi')
depends_on('python')
depends_on('zlib')
depends_on('flex@:2.6.1') # <- restriction due to scotch
depends_on('flex', type='build')
depends_on('cmake', type='build')
depends_on('scotch~metis', when='~ptscotch+scotch')

View file

@ -291,7 +291,7 @@ class OpenfoamCom(Package):
depends_on('fftw')
depends_on('boost')
depends_on('cgal')
depends_on('flex@:2.6.1') # <- restriction due to scotch
depends_on('flex', type='build')
depends_on('cmake', type='build')
# Require scotch with ptscotch - corresponds to standard OpenFOAM setup

View file

@ -91,7 +91,7 @@ class OpenfoamOrg(Package):
provides('openfoam')
depends_on('mpi')
depends_on('zlib')
depends_on('flex@:2.6.1') # <- restriction due to scotch
depends_on('flex', type='build')
depends_on('cmake', type='build')
# Require scotch with ptscotch - corresponds to standard OpenFOAM setup

View file

@ -51,7 +51,8 @@ class Scotch(Package):
variant('int64', default=False,
description='Use int64_t for SCOTCH_Num typedef')
depends_on('flex@:2.6.1', type='build')
# Does not build with flex 2.6.[23]
depends_on('flex@:2.6.1,2.6.4:', type='build')
depends_on('bison', type='build')
depends_on('mpi', when='+mpi')
depends_on('zlib', when='+compression')