Change the way we build Lua

We're now using the internal version of Lua, and set LUA_PATH correctly.

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/lua/Makefile b/lua/Makefile
index b7e73a12bb0846696186f6847f68b41ebabf550b..9b3afd3df5372b8f54675b45f0b820a0b6b43534 100644 (file)
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -31,32 +31,31 @@ include $(TOPLEVEL)/make.vars
 
 .PHONY: clean all install
 
-#
-# if they change the way Lua is built, we have a problem.
-#
-
 LUA_HEADER = lua.h lauxlib.h lualib.h luaconf.h
 
+.PHONY: lua-5.1.3
 lua-5.1.3:
-       tar -xzf $(LUA_SOURCE_PATH)/lua-5.1.3.tar.gz -C $(LUA_UNPACK_PATH); \
-       $(MAKE) -C $(LUA_UNPACK_PATH)/lua-5.1.3/src all \
-           MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -ldl"; \
+       $(MAKE) -C lua-5.1.3/src all MYCFLAGS="\
+               -DLUA_USE_POSIX -DLUA_USE_DLOPEN \
+               -DLUA_PATH_DEFAULT='\"$(LIBDIR)/?.lua\"' \
+               -DLUA_CPATH_DEFAULT='\"$(LIBDIR)/?.so\"'" \
+               MYLIBS="-Wl,-E -ldl"
 
 all: lua-5.1.3
 
 install: all
-       mkdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3; \
-       install -m755 $(LUA_UNPACK_PATH)/lua-5.1.3/src/lua $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3; \
-       install -m755 $(LUA_UNPACK_PATH)/lua-5.1.3/src/luac $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3; \
-       install -m644 $(LUA_UNPACK_PATH)/lua-5.1.3/src/lua.h $(DESTDIR)$(INCDIR)/lua-5.1.3; \
-       install -m644 $(LUA_UNPACK_PATH)/lua-5.1.3/src/lauxlib.h $(DESTDIR)$(INCDIR)/lua-5.1.3; \
-       install -m644 $(LUA_UNPACK_PATH)/lua-5.1.3/src/lualib.h $(DESTDIR)$(INCDIR)/lua-5.1.3; \
-       install -m644 $(LUA_UNPACK_PATH)/lua-5.1.3/src/luaconf.h $(DESTDIR)$(INCDIR)/lua-5.1.3; \
+       mkdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3
+       install -m755 lua-5.1.3/src/lua $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3
+       install -m755 lua-5.1.3/src/luac $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3
+       install -m644 lua-5.1.3/src/lua.h $(DESTDIR)$(INCDIR)/lua-5.1.3
+       install -m644 lua-5.1.3/src/lauxlib.h $(DESTDIR)$(INCDIR)/lua-5.1.3
+       install -m644 lua-5.1.3/src/lualib.h $(DESTDIR)$(INCDIR)/lua-5.1.3
+       install -m644 lua-5.1.3/src/luaconf.h $(DESTDIR)$(INCDIR)/lua-5.1.3
 
 uninstall:
-       rm -f $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3; \
-       rm -f $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3; \
-       rm -fr $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3; \
+       rm -f $(DESTDIR)$(LIBEXECDIR)/e2-lua-5.1.3
+       rm -f $(DESTDIR)$(LIBEXECDIR)/e2-luac-5.1.3
+       rm -fr $(DESTDIR)$(LIBEXECDIR)/lua-5.1.3
        for x in $(LUA_HEADER) ; do \
                rm -f $(DESTDIR)$(INCDIR)/lua-5.1.3/$$x ; \
        done

diff --git a/make.vars b/make.vars
index 2f4980383e08d700507c3ff710f73624516a5184..37512222283eedf9840e5d0de446637fabff96c7 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -69,20 +69,14 @@ LUA_VERSION       = 5.1.3
 LUA_ALL_VERSIONS  = 5.1.2 5.1.3
 LUA               = $(LIBEXECDIR)/e2-lua-$(LUA_VERSION)
 LUAC              = $(LIBEXECDIR)/e2-luac-$(LUA_VERSION)
-ifdef LUA_UNPACK_PATH
-BUILD_LUAC        = $(LUA_UNPACK_PATH)/lua-$(LUA_VERSION)/src/luac
-BUILD_LUA_CPPFLAGS = -I $(LUA_UNPACK_PATH)/lua-$(LUA_VERSION)/src
-else
 BUILD_LUAC        = $(TOPLEVEL)/lua/lua-$(LUA_VERSION)/src/luac
 BUILD_LUA_CPPFLAGS = -I $(TOPLEVEL)/lua/lua-$(LUA_VERSION)/src
-endif
 LUA_CPPFLAGS      = -I $(INCDIR)/lua-$(LUA_VERSION) \
                        -D_FILE_OFFSET_BITS=64
 UPSTREAM          = $(E2DATA)/upstream
 BASE_PROJECT_PATH = $(E2DATA)/projects/emlix/emlix-base-project/proj/emlix-base-project.git
 BINARY_STORE      = $(E2DATA)/projects/emlix/e2/files
 LUA_SOURCE_PATH   ?= $(TOPLEVEL)
-LUA_UNPACK_PATH   ?= .
 
 export LUA_VERSION UPSTREAM BASE_PROJECT_PATH LUAC BUILD_LUAC ARCH BINARY_STORE