diff options
| author | Michael Kuhn <michael@ikkoku.de> | 2019-03-07 20:15:47 +0100 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-03-07 13:15:47 -0600 |
| commit | 3fb75e12060979a71f9389722c3139eacf800911 (patch) | |
| tree | 37d8613a9c3cbec11cf53e33622cbe03c19c8eb9 /var | |
| parent | 49e307398bc2b429a5b76b050107f31ba1f30b55 (diff) | |
| download | spack-3fb75e12060979a71f9389722c3139eacf800911.tar.gz spack-3fb75e12060979a71f9389722c3139eacf800911.tar.bz2 spack-3fb75e12060979a71f9389722c3139eacf800911.tar.xz spack-3fb75e12060979a71f9389722c3139eacf800911.zip | |
flex package: patch for building 2.6.4 with gcc 7 (#10754)
Remove 2.6.3 as preferred version (but keep it available for
building). The latest version (currently 2.6.4) is now preferred
(according to Spack's defaults).
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/flex/package.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index 1dd2db241d..65458e44f9 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -14,10 +14,7 @@ class Flex(AutotoolsPackage): url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz" version('2.6.4', '2882e3179748cc9f9c23ec593d6adc8d') - # 2.6.4 fails to compile with gcc@7.2: - # see https://github.com/spack/spack/issues/8152 and - # https://github.com/spack/spack/issues/6942 - version('2.6.3', 'a5f65570cd9107ec8a8ec88f17b31bb1', preferred=True) + version('2.6.3', 'a5f65570cd9107ec8a8ec88f17b31bb1') # Avoid flex '2.6.2' (major bug) # See issue #2554; https://github.com/westes/flex/issues/113 version('2.6.1', '05bcd8fb629e0ae130311e8a6106fa82') @@ -34,12 +31,22 @@ class Flex(AutotoolsPackage): # Older tarballs don't come with a configure script depends_on('m4', type='build') depends_on('autoconf', type='build', when='@:2.6.0') + depends_on('autoconf', type='build', when='@2.6.4 %gcc@7') depends_on('automake', type='build', when='@:2.6.0') + depends_on('automake', type='build', when='@2.6.4 %gcc@7') depends_on('libtool', type='build', when='@:2.6.0') + depends_on('libtool', type='build', when='@2.6.4 %gcc@7') - # Build issue for v2.6.4 when gcc@7.2.0: is used - # See issue #219; https://github.com/westes/flex/issues/219 - conflicts('%gcc@7.2.0:', when='@2.6.4') + # 2.6.4 fails to compile with gcc@7, see: + # - https://github.com/spack/spack/issues/8152 + # - https://github.com/spack/spack/issues/6942 + # - https://github.com/westes/flex/issues/241 + patch('https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380.patch', sha256='09c22e5c6fef327d3e48eb23f0d610dcd3a35ab9207f12e0f875701c677978d3', when='@2.6.4 %gcc@7') + + @property + def force_autoreconf(self): + # The patch for 2.6.4 touches configure + return self.spec.satisfies('@2.6.4 %gcc@7') def url_for_version(self, version): url = "https://github.com/westes/flex" |