From 2deeec1a00c1496a61be9191c2aeca078b04434e Mon Sep 17 00:00:00 2001 From: mpeterv Date: Fri, 4 Dec 2015 17:45:58 +0300 Subject: [PATCH] Fix installation of LuaJIT jit.* modules --- hererocks.py | 5 +++-- test.sh | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hererocks.py b/hererocks.py index f8471ab..ddeaf3b 100755 --- a/hererocks.py +++ b/hererocks.py @@ -447,10 +447,11 @@ class LuaJIT(Lua): def make(): run_command("make", "PREFIX=" + quote(opts.location)) - @staticmethod - def make_install(): + def make_install(self): run_command("make install", "PREFIX=" + quote(opts.location), "INSTALL_TNAME=lua", "INSTALL_TSYM=luajit_symlink", + "INSTALL_LJLIBD=" + quote(os.path.join( + opts.location, "share", "lua", self.major_version)), "INSTALL_INC=" + quote(os.path.join(opts.location, "include"))) if os.path.exists(os.path.join(opts.location, "bin", "luajit_symlink")): diff --git a/test.sh b/test.sh index 0f4bbc8..be5b33a 100755 --- a/test.sh +++ b/test.sh @@ -14,6 +14,7 @@ $HEREROCKS -l^ -r^ | grep "already installed" rm test/here -rf $HEREROCKS -j 2.1 -r^ | grep "Fetching" | grep "cached" lua -v +lua -e "require 'jit.bcsave'" luarocks --version luarocks make hererocks-test | grep "2\.1"