version up: lua 5.3.1. also fix a wrong rpath.

1f0a41b0 · Kazuhiko Shiozaki · 04c06178 · 1f0a41b0
Commit 1f0a41b0 authored Oct 25, 2015 by Kazuhiko Shiozaki
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 8 deletions

component/lua/buildout.cfg component/lua/buildout.cfg +7 -8

No files found.
--- a/component/lua/buildout.cfg
+++ b/component/lua/buildout.cfg
@@ -7,13 +7,12 @@ parts =
 [lua]
 recipe = slapos.recipe.cmmi
-url = http://www.lua.org/ftp/lua-5.2.3.tar.gz
+url = http://www.lua.org/ftp/lua-5.3.1.tar.gz
-md5sum = dc7f94ec6ff15c985d2d6ad0f1b35654
+md5sum = 797adacada8d85761c079390ff1d9961
-configure-command = make posix
+configure-command = true
+make-options =
+  "$(uname -sr 2>/dev/null|grep -Eq '^Linux' && echo linux || echo posix)"
+  MYCFLAGS="-I${readline:location}/include"
+  MYLDFLAGS="-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib"
 make-targets =
  install INSTALL_TOP=${buildout:parts-directory}/${:_buildout_section_name_}
-environment =
-  CMAKE_INCLUDE_PATH=${readline:location}/include
-  CMAKE_LIBRARY_PATH=${readline:location}/lib
-  CPPFLAGS =-I${readline:location}/include
-  LDFLAGS =-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib