From d4e2ac1fa3e65cebb56217f75dc547eb27e14d5b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 17 Jun 2019 17:50:19 +0200 Subject: [PATCH] - lua: split patch; update host-lua build --- archive-patches/lua-01-fix-LUA_ROOT.patch | 13 ++++ archive-patches/lua-01-fix-build.patch | 62 -------------------- archive-patches/lua-01-remove-man.patch | 13 ++++ archive-patches/lua-01-remove-readline.patch | 25 ++++++++ make/host-tools.mk | 12 ++-- make/system-lua.mk | 8 +-- 6 files changed, 61 insertions(+), 72 deletions(-) create mode 100644 archive-patches/lua-01-fix-LUA_ROOT.patch delete mode 100644 archive-patches/lua-01-fix-build.patch create mode 100644 archive-patches/lua-01-remove-man.patch create mode 100644 archive-patches/lua-01-remove-readline.patch diff --git a/archive-patches/lua-01-fix-LUA_ROOT.patch b/archive-patches/lua-01-fix-LUA_ROOT.patch new file mode 100644 index 00000000..b65193e2 --- /dev/null +++ b/archive-patches/lua-01-fix-LUA_ROOT.patch @@ -0,0 +1,13 @@ +diff --git a/src/luaconf.h b/src/luaconf.h +index 18be9a9..131747b 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -100,7 +99,7 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ diff --git a/archive-patches/lua-01-fix-build.patch b/archive-patches/lua-01-fix-build.patch deleted file mode 100644 index ab1b2e72..00000000 --- a/archive-patches/lua-01-fix-build.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 57e1907d6813565e29990864807bdceb393653d3 Mon Sep 17 00:00:00 2001 -Message-Id: <57e1907d6813565e29990864807bdceb393653d3.1390660080.git.striper@gmx.de> -From: striper -Date: Sat, 25 Jan 2014 15:27:54 +0100 -Subject: [PATCH] - fix build - ---- - Makefile | 2 +- - src/Makefile | 2 +- - src/luaconf.h | 3 +-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index d2c7db4..2dea130 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,7 +14,7 @@ INSTALL_TOP= /usr/local - INSTALL_BIN= $(INSTALL_TOP)/bin - INSTALL_INC= $(INSTALL_TOP)/include - INSTALL_LIB= $(INSTALL_TOP)/lib --INSTALL_MAN= $(INSTALL_TOP)/man/man1 -+INSTALL_MAN= $(INSTALL_TOP)/.remove - INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V - INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - -diff --git a/src/Makefile b/src/Makefile -index 7b4b2b7..395d5ba 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -103,7 +103,7 @@ freebsd: - generic: $(ALL) - - linux: -- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" -+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -fPIC" SYSLIBS="-Wl,-E -ldl" - - macosx: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc -diff --git a/src/luaconf.h b/src/luaconf.h -index 18be9a9..131747b 100644 ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -43,7 +43,6 @@ - #if defined(LUA_USE_LINUX) - #define LUA_USE_POSIX - #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ --#define LUA_USE_READLINE /* needs some extra libraries */ - #define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */ - #define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ - #define LUA_USE_LONGLONG /* assume support for long long */ -@@ -100,7 +99,7 @@ - #else /* }{ */ - - #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR - #define LUA_PATH_DEFAULT \ --- -1.8.5.2 - diff --git a/archive-patches/lua-01-remove-man.patch b/archive-patches/lua-01-remove-man.patch new file mode 100644 index 00000000..50ce8abd --- /dev/null +++ b/archive-patches/lua-01-remove-man.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index d2c7db4..2dea130 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ INSTALL_TOP= /usr/local + INSTALL_BIN= $(INSTALL_TOP)/bin + INSTALL_INC= $(INSTALL_TOP)/include + INSTALL_LIB= $(INSTALL_TOP)/lib +-INSTALL_MAN= $(INSTALL_TOP)/man/man1 ++INSTALL_MAN= $(INSTALL_TOP)/.remove + INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V + INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + diff --git a/archive-patches/lua-01-remove-readline.patch b/archive-patches/lua-01-remove-readline.patch new file mode 100644 index 00000000..ea281275 --- /dev/null +++ b/archive-patches/lua-01-remove-readline.patch @@ -0,0 +1,25 @@ +diff --git a/src/Makefile b/src/Makefile +index 7b4b2b7..395d5ba 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -103,7 +103,7 @@ freebsd: + generic: $(ALL) + + linux: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX -fPIC" SYSLIBS="-Wl,-E -ldl" + + macosx: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc +diff --git a/src/luaconf.h b/src/luaconf.h +index 18be9a9..131747b 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -43,7 +43,6 @@ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +-#define LUA_USE_READLINE /* needs some extra libraries */ + #define LUA_USE_STRTODHEX /* assume 'strtod' handles hex formats */ + #define LUA_USE_AFORMAT /* assume 'printf' handles 'aA' specifiers */ + #define LUA_USE_LONGLONG /* assume support for long long */ diff --git a/make/host-tools.mk b/make/host-tools.mk index aa7dbec9..5e74e95a 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -239,21 +239,23 @@ $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz | $ # ----------------------------------------------------------------------------- +HOST_LUA = $(HOST_DIR)/bin/lua HOST_LUA_VER = $(LUA_VER) #$(ARCHIVE)/lua-$(HOST_LUA_VER).tar.gz: # $(WGET) http://www.lua.org/ftp/lua-$(HOST_LUA_VER).tar.gz -HOST_LUA_PATCH = lua-01-fix-build.patch +HOST_LUA_PATCH = lua-01-fix-LUA_ROOT.patch +HOST_LUA_PATCH += lua-01-remove-readline.patch -host_lua: $(HOST_DIR)/bin/lua -$(HOST_DIR)/bin/lua: $(ARCHIVE)/lua-$(HOST_LUA_VER).tar.gz | $(TARGET_DIR) +host_lua: $(HOST_LUA) +$(HOST_LUA): $(ARCHIVE)/lua-$(HOST_LUA_VER).tar.gz | $(TARGET_DIR) $(REMOVE)/lua-$(HOST_LUA_VER) $(UNTAR)/lua-$(HOST_LUA_VER).tar.gz $(CHDIR)/lua-$(HOST_LUA_VER); \ $(call apply_patches, $(HOST_LUA_PATCH)); \ - $(MAKE) linux - install -m 0755 -D $(BUILD_TMP)/lua-$(HOST_LUA_VER)/src/lua $@ + $(MAKE) linux; \ + $(MAKE) install INSTALL_TOP=$(HOST_DIR) $(REMOVE)/lua-$(HOST_LUA_VER) # ----------------------------------------------------------------------------- diff --git a/make/system-lua.mk b/make/system-lua.mk index f42722a7..696f4cfb 100644 --- a/make/system-lua.mk +++ b/make/system-lua.mk @@ -3,17 +3,15 @@ # # ----------------------------------------------------------------------------- -HOST_LUA = $(HOST_DIR)/bin/lua - -# ----------------------------------------------------------------------------- - LUA_ABIVER = 5.2 LUA_VER = $(LUA_ABIVER).4 $(ARCHIVE)/lua-$(LUA_VER).tar.gz: $(WGET) http://www.lua.org/ftp/lua-$(LUA_VER).tar.gz -LUA_PATCH = lua-01-fix-build.patch +LUA_PATCH = lua-01-fix-LUA_ROOT.patch +LUA_PATCH += lua-01-remove-readline.patch +LUA_PATCH += lua-01-remove-man.patch LUA_PATCH += lua-02-shared-libs-for-lua.patch LUA_PATCH += lua-03-lua-pc.patch LUA_PATCH += lua-04-crashfix.diff