* gnu/packages/lua.scm (lua, lua-5.1)[arguments]: Set the make flags
properly for each version of lua.
---
gnu/packages/lua.scm | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 87f53d1..7699a91 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -24,6 +24,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages readline))
@@ -47,7 +48,7 @@
#:test-target "test"
#:phases (alist-replace
'build
- (lambda _ (zero? (system* "make" "CFLAGS=-fPIC" "linux")))
+ (lambda _ (zero? (system* "make" "MYCFLAGS=-fPIC" "linux")))
(alist-replace
'install
(lambda* (#:key outputs #:allow-other-keys)
@@ -77,7 +78,23 @@ for configuration, scripting, and rapid prototyping.")
version ".tar.gz"))
(sha256
(base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))
- (patches (list (search-patch "lua51-liblua-so.patch")))))))
+ (patches (list (search-patch "lua51-liblua-so.patch")))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments lua)
+ ((#:phases lua-phases)
+ `(modify-phases ,lua-phases
+ (replace
+ 'build
+ (lambda _
+ (and
+ (zero? (system* "make" (string-append
+ "MYCFLAGS="
+ (string-join '("-fPIC "
+ "-DLUA_USE_LINUX "
+ "MYLIBS=-Wl,-E "
+ "-ldl -lreadline "
+ "-lhistory -lncurses")))
+ "linux")))))))))))
(define-public luajit
(package
@@ -89,8 +106,8 @@ for configuration, scripting, and rapid prototyping.")
version ".tar.gz"))
(sha256
(base32 "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"))
- (patches (list (search-patch "luajit-symlinks.patch")
- (search-patch "luajit-no_ldconfig.patch")))))
+ (patches (list (search-patch "luajit-symlinks.patch")
+ (search-patch "luajit-no_ldconfig.patch")))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ;luajit is distributed without tests
--
2.6.1
