summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMark Olesen <Mark.Olesen@gmx.net>2017-06-23 14:45:17 +0100
committerAdam J. Stewart <ajstewart426@gmail.com>2017-06-23 08:45:17 -0500
commitb741809bb200d4c9a06596edd89bfab05218c3d8 (patch)
tree1dfe7df7b1957992ea183696162c3a63098deb07 /var
parent8125780b8604c8e408cdb03b1995c181700bda7c (diff)
downloadspack-b741809bb200d4c9a06596edd89bfab05218c3d8.tar.gz
spack-b741809bb200d4c9a06596edd89bfab05218c3d8.tar.bz2
spack-b741809bb200d4c9a06596edd89bfab05218c3d8.tar.xz
spack-b741809bb200d4c9a06596edd89bfab05218c3d8.zip
BUG: flex+lex fails with lib64/ installation (issue #4583) (#4584)
- new version 2.6.4 as well
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/flex/package.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py
index 73d08d98e0..eda45c28a6 100644
--- a/var/spack/repos/builtin/packages/flex/package.py
+++ b/var/spack/repos/builtin/packages/flex/package.py
@@ -32,6 +32,7 @@ class Flex(AutotoolsPackage):
homepage = "https://github.com/westes/flex"
url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz"
+ version('2.6.4', '2882e3179748cc9f9c23ec593d6adc8d')
version('2.6.3', 'a5f65570cd9107ec8a8ec88f17b31bb1')
# Problematic version:
# See issue #2554; https://github.com/westes/flex/issues/113
@@ -68,13 +69,17 @@ class Flex(AutotoolsPackage):
@run_after('install')
def symlink_lex(self):
+ """Install symlinks for lex compatibility."""
if self.spec.satisfies('+lex'):
dso = dso_suffix
for dir, flex, lex in \
- ((self.prefix.bin, 'flex', 'lex'),
- (self.prefix.lib, 'libfl.a', 'libl.a'),
- (self.prefix.lib, 'libfl.' + dso, 'libl.' + dso)):
- with working_dir(dir):
- if (os.path.isfile(flex) and not
- os.path.lexists(lex)):
- symlink(flex, lex)
+ ((self.prefix.bin, 'flex', 'lex'),
+ (self.prefix.lib, 'libfl.a', 'libl.a'),
+ (self.prefix.lib, 'libfl.' + dso, 'libl.' + dso),
+ (self.prefix.lib64, 'libfl.a', 'libl.a'),
+ (self.prefix.lib64, 'libfl.' + dso, 'libl.' + dso)):
+
+ if os.path.isdir(dir):
+ with working_dir(dir):
+ if (os.path.isfile(flex) and not os.path.lexists(lex)):
+ symlink(flex, lex)