From 992b9c46dd432ad409025a3cbaeb1c06f880526c Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sun, 10 Jan 2016 13:44:53 -0800 Subject: [PATCH 1/3] Resolve readline/ncurses dependency when building Lua --- var/spack/packages/lua/package.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/var/spack/packages/lua/package.py b/var/spack/packages/lua/package.py index 6d8f7806d98..f0c949687e9 100644 --- a/var/spack/packages/lua/package.py +++ b/var/spack/packages/lua/package.py @@ -18,11 +18,12 @@ class Lua(Package): version('5.1.3', 'a70a8dfaa150e047866dc01a46272599') depends_on('ncurses') + depends_on('readline') def install(self, spec, prefix): 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, 'linux') 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') From 9f2dbc9df43ca0ebb4409c61d0a60bb5c6eccfa7 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sun, 10 Jan 2016 19:34:02 -0500 Subject: [PATCH 2/3] Update Lua to 5.3.2 --- var/spack/packages/lua/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/packages/lua/package.py b/var/spack/packages/lua/package.py index f0c949687e9..e1a1ae95063 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') From 23c5a1e6e9b6f07ee3a97eeca3e786703bc1a58d Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sun, 10 Jan 2016 19:37:44 -0500 Subject: [PATCH 3/3] Build Lua on Darwin --- var/spack/packages/lua/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/var/spack/packages/lua/package.py b/var/spack/packages/lua/package.py index e1a1ae95063..ca8cfc53657 100644 --- a/var/spack/packages/lua/package.py +++ b/var/spack/packages/lua/package.py @@ -22,9 +22,13 @@ class Lua(Package): 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 -lncurses' % spec['ncurses'].prefix.lib, - 'linux') + target) make('INSTALL_TOP=%s' % prefix, 'MYLDFLAGS=-L%s -lncurses' % spec['ncurses'].prefix.lib, 'install')