From c771edfaa76cbdd360aa728aad718c5377fa110e Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 25 May 2018 09:01:44 +0200 Subject: [PATCH] luarocks: set default lib/inc dir to @TERMUX_PREFIX@/{lib,include} --- packages/luarocks/build.sh | 1 + packages/luarocks/src-luarocks-cfg.lua.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 packages/luarocks/src-luarocks-cfg.lua.patch diff --git a/packages/luarocks/build.sh b/packages/luarocks/build.sh index 352fc7250a..7f86f8c20b 100644 --- a/packages/luarocks/build.sh +++ b/packages/luarocks/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://luarocks.org/ TERMUX_PKG_DESCRIPTION="Deployment and management system for Lua modules" TERMUX_PKG_VERSION=2.4.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=3938df33de33752ff2c526e604410af3dceb4b7ff06a770bc4a240de80a1f934 TERMUX_PKG_SRCURL=https://luarocks.org/releases/luarocks-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="curl, lua" diff --git a/packages/luarocks/src-luarocks-cfg.lua.patch b/packages/luarocks/src-luarocks-cfg.lua.patch new file mode 100644 index 0000000000..5dc9919423 --- /dev/null +++ b/packages/luarocks/src-luarocks-cfg.lua.patch @@ -0,0 +1,17 @@ +--- ../cfg.lua.orig 2018-05-25 06:56:17.183526289 +0000 ++++ ./src/luarocks/cfg.lua 2018-05-25 06:57:25.695490218 +0000 +@@ -517,10 +517,10 @@ + defaults.lib_extension = "so" + defaults.external_lib_extension = "so" + defaults.obj_extension = "o" +- defaults.external_deps_dirs = { "/usr/local", "/usr" } +- defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin" +- defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" +- defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" ++ defaults.external_deps_dirs = { "@TERMUX_PREFIX@/local", "@TERMUX_PREFIX@" } ++ defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "@TERMUX_PREFIX@/local/bin" ++ defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "@TERMUX_PREFIX@/local/include" ++ defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "@TERMUX_PREFIX@/local/lib" + defaults.variables.CFLAGS = "-O2" + defaults.cmake_generator = "Unix Makefiles" + defaults.variables.CC = "gcc"