diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-12 09:13:21 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-12 09:13:21 -0800 |
| commit | dd0aa90aa1872c11ed19b58a020e4f38109ae00a (patch) | |
| tree | ee92eacbee1677d717813e3f901effbd3ff689f0 /var | |
| parent | 1a3c0063a5fff158e0300624d3a178a6e0ccdee2 (diff) | |
| parent | 23c5a1e6e9b6f07ee3a97eeca3e786703bc1a58d (diff) | |
| download | spack-dd0aa90aa1872c11ed19b58a020e4f38109ae00a.tar.gz spack-dd0aa90aa1872c11ed19b58a020e4f38109ae00a.tar.bz2 spack-dd0aa90aa1872c11ed19b58a020e4f38109ae00a.tar.xz spack-dd0aa90aa1872c11ed19b58a020e4f38109ae00a.zip | |
Merge pull request #328 from eschnett/eschnett/lua-readline
Resolve readline/ncurses dependency when building Lua
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/lua/package.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/var/spack/packages/lua/package.py b/var/spack/packages/lua/package.py index 6d8f7806d9..ca8cfc5365 100644 --- a/var/spack/packages/lua/package.py +++ b/var/spack/packages/lua/package.py @@ -6,6 +6,7 @@ class Lua(Package): homepage = "http://www.lua.org" url = "http://www.lua.org/ftp/lua-5.1.5.tar.gz" + version('5.3.2', '33278c2ab5ee3c1a875be8d55c1ca2a1') version('5.3.1', '797adacada8d85761c079390ff1d9961') version('5.3.0', 'a1b0a7e92d0c85bbff7a8d27bf29f8af') version('5.2.4', '913fdb32207046b273fdb17aad70be13') @@ -18,11 +19,16 @@ class Lua(Package): version('5.1.3', 'a70a8dfaa150e047866dc01a46272599') depends_on('ncurses') + depends_on('readline') def install(self, spec, prefix): + if spec.satisfies("=darwin-i686") or spec.satisfies("=darwin-x86_64"): + target = 'macosx' + else: + target = 'linux' make('INSTALL_TOP=%s' % prefix, - 'MYLDFLAGS="-L%s/lib -Wl,-rpath,%s"' % (spec['ncurses'].prefix,spec['ncurses'].prefix), - 'linux') + 'MYLDFLAGS=-L%s -lncurses' % spec['ncurses'].prefix.lib, + target) make('INSTALL_TOP=%s' % prefix, - 'MYLDFLAGS="-L%s/lib -Wl,-rpath,%s"' % (spec['ncurses'].prefix,spec['ncurses'].prefix), + 'MYLDFLAGS=-L%s -lncurses' % spec['ncurses'].prefix.lib, 'install') |