@@ -9,12 +9,12 @@ CGILUA_SITE = http://github.com/downloads/keplerproject/cgilua
CGILUA_LICENSE = MIT
define CGILUA_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) install LUA_DIR="$(TARGET_DIR)/usr/share/lua"
+ $(MAKE) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install
endef
define CGILUA_UNINSTALL_TARGET_CMDS
- rm -rf "$(TARGET_DIR)/usr/share/lua/cgilua"
- rm -f "$(TARGET_DIR)/usr/share/lua/cgilua.lua"
+ rm -rf "$(TARGET_DIR)/usr/share/lua/5.1/cgilua"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/cgilua.lua"
endef
$(eval $(generic-package))
@@ -10,11 +10,11 @@ COPAS_LICENSE = MIT
define COPAS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/src/copas/copas.lua \
- $(TARGET_DIR)/usr/share/lua/copas.lua
+ $(TARGET_DIR)/usr/share/lua/5.1/copas.lua
endef
define COPAS_UNINSTALL_TARGET_CMDS
- rm -f "$(TARGET_DIR)/usr/share/lua/copas.lua"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/copas.lua"
endef
$(eval $(generic-package))
@@ -10,11 +10,11 @@ COXPCALL_LICENSE = MIT
define COXPCALL_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/src/coxpcall.lua \
- $(TARGET_DIR)/usr/share/lua/coxpcall.lua
+ $(TARGET_DIR)/usr/share/lua/5.1/coxpcall.lua
endef
define COXPCALL_UNINSTALL_TARGET_CMDS
- rm -f "$(TARGET_DIR)/usr/share/lua/coxpcall.lua"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/coxpcall.lua"
endef
$(eval $(generic-package))
@@ -18,11 +18,11 @@ endef
define LBASE64_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/base64.so \
- $(TARGET_DIR)/usr/lib/lua/base64.so
+ $(TARGET_DIR)/usr/lib/lua/5.1/base64.so
endef
define LBASE64_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/lib/lua/base64.so
+ rm -f $(TARGET_DIR)/usr/lib/lua/5.1/base64.so
endef
define LBASE64_CLEAN_CMDS
@@ -9,6 +9,6 @@ LUA_EV_SITE = http://github.com/brimworks/lua-ev/tarball/$(LUA_EV_VERSION)
LUA_EV_DEPENDENCIES = luainterpreter libev
LUA_EV_LICENSE = MIT
LUA_EV_LICENSE_FILES = README
-LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua"
+LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua/5.1"
$(eval $(cmake-package))
@@ -15,11 +15,11 @@ define LUA_MSGPACK_NATIVE_BUILD_CMDS
endef
define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS
- $(INSTALL) -m 755 -D $(@D)/msgpack.so $(TARGET_DIR)/usr/lib/lua/msgpack.so
+ $(INSTALL) -m 755 -D $(@D)/msgpack.so $(TARGET_DIR)/usr/lib/lua/5.1/msgpack.so
endef
define LUA_MSGPACK_NATIVE_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/lib/lua/msgpack.so
+ rm -f $(TARGET_DIR)/usr/lib/lua/5.1/msgpack.so
endef
define LUA_MSGPACK_NATIVE_CLEAN_CMDS
@@ -1,5 +1,4 @@
Adjust installation location to /usr.
-Remove version in module paths.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
@@ -7,7 +6,7 @@ Index: b/etc/lua.pc
===================================================================
--- a/etc/lua.pc
+++ b/etc/lua.pc
-@@ -8,13 +8,13 @@
+@@ -8,7 +8,7 @@
R= 5.1.5
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
@@ -16,28 +15,16 @@ Index: b/etc/lua.pc
INSTALL_BIN= ${prefix}/bin
INSTALL_INC= ${prefix}/include
INSTALL_LIB= ${prefix}/lib
- INSTALL_MAN= ${prefix}/man/man1
--INSTALL_LMOD= ${prefix}/share/lua/${V}
--INSTALL_CMOD= ${prefix}/lib/lua/${V}
-+INSTALL_LMOD= ${prefix}/share/lua
-+INSTALL_CMOD= ${prefix}/lib/lua
-
- # canonical vars
- exec_prefix=${prefix}
Index: b/src/luaconf.h
===================================================================
--- a/src/luaconf.h
+++ b/src/luaconf.h
-@@ -94,9 +94,9 @@
+@@ -94,7 +94,7 @@
".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
#else
-#define LUA_ROOT "/usr/local/"
--#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
--#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
+#define LUA_ROOT "/usr/"
-+#define LUA_LDIR LUA_ROOT "share/lua/"
-+#define LUA_CDIR LUA_ROOT "lib/lua/"
+ #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
+ #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
#define LUA_PATH_DEFAULT \
- "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
@@ -12,12 +12,11 @@ LUABITOP_LICENSE_FILES = README
LUABITOP_DEPENDENCIES = lua
define LUABITOP_BUILD_CMDS
- $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+ $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) INCLUDES="-I$(STAGING_DIR)/usr/include"
endef
define LUABITOP_INSTALL_TARGET_CMDS
- mkdir -p $(TARGET_DIR)/usr/lib/lua
- $(INSTALL) -p $(@D)/bit.so $(TARGET_DIR)/usr/lib/lua
+ $(INSTALL) -p $(@D)/bit.so $(TARGET_DIR)/usr/lib/lua/5.1
endef
define LUABITOP_CLEAN_CMDS
@@ -21,7 +21,7 @@ define LUACJSON_BUILD_CMDS
endef
define LUACJSON_INSTALL_TARGET_CMDS
- install -D -m 0644 $(@D)/cjson.so $(TARGET_DIR)/usr/lib/lua/cjson.so
+ $(MAKE) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" -C $(@D) install
endef
define LUACJSON_CLEAN_CMDS
@@ -29,7 +29,7 @@ define LUACJSON_CLEAN_CMDS
endef
define LUACJSON_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/lib/lua/cjson.so
+ rm -f $(TARGET_DIR)/usr/lib/lua/5.1/cjson.so
endef
$(eval $(generic-package))
@@ -11,7 +11,7 @@ LUAEXPAT_LICENSE = MIT
LUAEXPAT_MFLAGS += LUA_VERSION_NUM=501
-LUAEXPAT_MFLAGS += LUA_INC=$(STAGING_DIR)/usr/include/lua
+LUAEXPAT_MFLAGS += LUA_INC=$(STAGING_DIR)/usr/include
LUAEXPAT_MFLAGS += EXPAT_INC=$(STAGING_DIR)/usr/include
LUAEXPAT_MFLAGS += LIBNAME=lxp.so
LUAEXPAT_MFLAGS += LIB_OPTION="-shared -fPIC $(TARGET_CFLAGS)"
@@ -23,13 +23,13 @@ define LUAEXPAT_BUILD_CMDS
endef
define LUAEXPAT_INSTALL_TARGET_CMDS
- $(INSTALL) -D $(@D)/src/lxp.so $(TARGET_DIR)/usr/lib/lua/lxp.so
- $(INSTALL) -D -m 0644 $(@D)/src/lxp/lom.lua $(TARGET_DIR)/usr/share/lua/lxp/lom.lua
+ $(INSTALL) -D $(@D)/src/lxp.so $(TARGET_DIR)/usr/lib/lua/5.1/lxp.so
+ $(INSTALL) -D -m 0644 $(@D)/src/lxp/lom.lua $(TARGET_DIR)/usr/share/lua/5.1/lxp/lom.lua
endef
define LUAEXPAT_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/lib/lua/lxp.so
- rm -f $(TARGET_DIR)/usr/share/lua/lxp/lom.lua
+ rm -f $(TARGET_DIR)/usr/lib/lua/5.1/lxp.so
+ rm -f $(TARGET_DIR)/usr/share/lua/5.1/lxp/lom.lua
endef
define LUAEXPAT_CLEAN_CMDS
@@ -11,11 +11,11 @@ LUAEXPATUTILS_DEPENDENCIES = luaexpat
define LUAEXPATUTILS_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/lua/doc.lua \
- $(TARGET_DIR)/usr/share/lua/lxp/doc.lua
+ $(TARGET_DIR)/usr/share/lua/5.1/lxp/doc.lua
endef
define LUAEXPATUTILS_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/share/lua/lxp/doc.lua
+ rm -f $(TARGET_DIR)/usr/share/lua/5.1/lxp/doc.lua
endef
$(eval $(generic-package))
@@ -18,11 +18,11 @@ define LUAFILESYSTEM_BUILD_CMDS
endef
define LUAFILESYSTEM_INSTALL_TARGET_CMDS
- $(INSTALL) -D $(@D)/src/lfs.so $(TARGET_DIR)/usr/lib/lua/lfs.so
+ $(INSTALL) -D $(@D)/src/lfs.so $(TARGET_DIR)/usr/lib/lua/5.1/lfs.so
endef
define LUAFILESYSTEM_UNINSTALL_TARGET_CMDS
- rm -f "$(TARGET_DIR)/usr/lib/lua/lfs.so"
+ rm -f "$(TARGET_DIR)/usr/lib/lua/5.1/lfs.so"
endef
define LUAFILESYSTEM_CLEAN_CMDS
deleted file mode 100644
@@ -1,22 +0,0 @@
-Adjust installation location to /usr
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/src/luaconf.h
-===================================================================
---- a/src/luaconf.h
-+++ b/src/luaconf.h
-@@ -26,9 +26,9 @@
- ** Note to distribution maintainers: do NOT patch the following line!
- ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
- */
--#define LUA_ROOT "/usr/local/"
--#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
--#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
-+#define LUA_ROOT "/usr/"
-+#define LUA_LDIR LUA_ROOT "share/lua/"
-+#define LUA_CDIR LUA_ROOT "lib/lua/"
- #ifdef LUA_XROOT
- #define LUA_JDIR LUA_XROOT "share/luajit-2.0.0/"
- #define LUA_XPATH \
@@ -10,7 +10,7 @@ LUAPOSIX_SOURCE = release-v$(LUAPOSIX_VERSION).tar.gz
LUAPOSIX_LICENSE = MIT
LUAPOSIX_LICENSE_FILES = COPYING
LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
-LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua" --datarootdir="/usr/share/lua"
+LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua/5.1" --datarootdir="/usr/share/lua/5.1"
ifeq ($(BR2_PACKAGE_NCURSES),y)
LUAPOSIX_DEPENDENCIES += ncurses
@@ -17,17 +17,15 @@ define LUASEC_BUILD_CMDS
endef
define LUASEC_INSTALL_TARGET_CMDS
- mkdir -p $(TARGET_DIR)/usr/share/lua
- mkdir -p $(TARGET_DIR)/usr/lib/lua
$(MAKE) -C $(@D) \
- LUAPATH="$(TARGET_DIR)/usr/share/lua" \
- LUACPATH="$(TARGET_DIR)/usr/lib/lua" install
+ LUAPATH="$(TARGET_DIR)/usr/share/lua/5.1" \
+ LUACPATH="$(TARGET_DIR)/usr/lib/lua/5.1" install
endef
define LUASEC_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/usr/lib/lua/ssl.so
- rm -rf $(TARGET_DIR)/usr/share/lua/ssl
- rm -f $(TARGET_DIR)/usr/share/lua/ssl.lua
+ rm -f $(TARGET_DIR)/usr/lib/lua/5.1/ssl.so
+ rm -rf $(TARGET_DIR)/usr/share/lua/5.1/ssl
+ rm -f $(TARGET_DIR)/usr/share/lua/5.1/ssl.lua
endef
$(eval $(generic-package))
@@ -18,17 +18,17 @@ endef
define LUASOCKET_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) -f makefile \
- INSTALL_TOP_SHARE="$(TARGET_DIR)/usr/share/lua" \
- INSTALL_TOP_LIB="$(TARGET_DIR)/usr/lib/lua" install
+ INSTALL_TOP_SHARE="$(TARGET_DIR)/usr/share/lua/5.1" \
+ INSTALL_TOP_LIB="$(TARGET_DIR)/usr/lib/lua/5.1" install
endef
define LUASOCKET_UNINSTALL_TARGET_CMDS
- rm -rf "$(TARGET_DIR)/usr/lib/lua/mime"
- rm -rf "$(TARGET_DIR)/usr/lib/lua/socket"
- rm -rf "$(TARGET_DIR)/usr/share/lua/socket"
- rm -f "$(TARGET_DIR)/usr/share/lua/socket.lua"
- rm -f "$(TARGET_DIR)/usr/share/lua/mime.lua"
- rm -f "$(TARGET_DIR)/usr/share/lua/ltn12.lua"
+ rm -rf "$(TARGET_DIR)/usr/lib/lua/5.1/mime"
+ rm -rf "$(TARGET_DIR)/usr/lib/lua/5.1/socket"
+ rm -rf "$(TARGET_DIR)/usr/share/lua/5.1/socket"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/socket.lua"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/mime.lua"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/ltn12.lua"
endef
define LUASOCKET_CLEAN_CMDS
@@ -27,13 +27,12 @@ define LUASQL_BUILD_CMDS
endef
define LUASQL_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) $(LUASQL_MAKE_FLAGS) PREFIX=/usr \
- LUA_DIR="$(TARGET_DIR)/usr/share/lua" \
- LUA_LIBDIR="$(TARGET_DIR)/usr/lib/lua" install
+ $(MAKE) -C $(@D) $(LUASQL_MAKE_FLAGS) \
+ PREFIX="$(TARGET_DIR)/usr" install
endef
define LUASQL_UNINSTALL_TARGET_CMDS
- rm -rf $(TARGET_DIR)/usr/lib/lua/luasql
+ rm -rf $(TARGET_DIR)/usr/lib/lua/5.1/luasql
endef
$(eval $(generic-package))
@@ -11,7 +11,7 @@ ORBIT_LICENSE_FILES = doc/us/license.md
define ORBIT_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) \
- LUA_DIR=$(TARGET_DIR)/usr/share/lua/ \
+ LUA_DIR=$(TARGET_DIR)/usr/share/lua/5.1/ \
BIN_DIR=$(TARGET_DIR)/usr/bin \
install
endef
@@ -14,13 +14,12 @@ define RINGS_BUILD_CMDS
endef
define RINGS_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) LUA_LIBDIR="$(TARGET_DIR)/usr/lib/lua" \
- LUA_DIR="$(TARGET_DIR)/usr/share/lua" install
+ $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)/usr" install
endef
define RINGS_UNINSTALL_TARGET_CMDS
- rm -f "$(TARGET_DIR)/usr/lib/lua/rings.so"
- rm -f "$(TARGET_DIR)/usr/share/lua/stable.lua"
+ rm -f "$(TARGET_DIR)/usr/lib/lua/5.1/rings.so"
+ rm -f "$(TARGET_DIR)/usr/share/lua/5.1/stable.lua"
endef
define RINGS_CLEAN_CMDS
@@ -9,13 +9,13 @@ WSAPI_SITE = http://github.com/downloads/keplerproject/wsapi
WSAPI_LICENSE = MIT
define WSAPI_INSTALL_TARGET_CMDS
- mkdir -p $(TARGET_DIR)/usr/share/lua/wsapi
+ mkdir -p $(TARGET_DIR)/usr/share/lua/5.1/wsapi
$(INSTALL) -m 0644 -D $(@D)/src/wsapi/*.lua \
- $(TARGET_DIR)/usr/share/lua/wsapi
+ $(TARGET_DIR)/usr/share/lua/5.1/wsapi
endef
define WSAPI_UNINSTALL_TARGET_CMDS
- rm -rf "$(TARGET_DIR)/usr/share/lua/wsapi"
+ rm -rf "$(TARGET_DIR)/usr/share/lua/5.1/wsapi"
endef
$(eval $(generic-package))
@@ -9,15 +9,13 @@ XAVANTE_SITE = http://github.com/downloads/keplerproject/xavante
XAVANTE_LICENSE = MIT
define XAVANTE_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) PREFIX=/usr \
- LUA_DIR="$(TARGET_DIR)/usr/share/lua" \
- LUA_LIBDIR="$(TARGET_DIR)/usr/lib/lua" install
+ $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)/usr" install
endef
define XAVANTE_UNINSTALL_TARGET_CMDS
- rm -rf "$(TARGET_DIR)/usr/share/xavante"
- rm -f "$(TARGET_DIR)/usr/share/xavante.lua"
- rm -f "$(TARGET_DIR)/usr/share/sajax.lua"
+ rm -rf "$(TARGET_DIR)/usr/share/5.1/xavante"
+ rm -f "$(TARGET_DIR)/usr/share/5.1/xavante.lua"
+ rm -f "$(TARGET_DIR)/usr/share/5.1/sajax.lua"
endef
$(eval $(generic-package))