summaryrefslogtreecommitdiffstats
path: root/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/freeswitch/0002-mod_lua-alpine-module-search-path.patch')
-rw-r--r--main/freeswitch/0002-mod_lua-alpine-module-search-path.patch44
1 files changed, 15 insertions, 29 deletions
diff --git a/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch b/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
index c83cfd58b..5a3f3551e 100644
--- a/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
+++ b/main/freeswitch/0002-mod_lua-alpine-module-search-path.patch
@@ -1,37 +1,23 @@
-From ab10000fddd6735ff986d3b0f8092bc733bf5267 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 10 Jun 2011 13:06:35 +0300
-Subject: [PATCH 2/2] mod_lua: alpine module search path
-
----
- src/mod/languages/mod_lua/lua/luaconf.h | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/mod/languages/mod_lua/lua/luaconf.h b/src/mod/languages/mod_lua/lua/luaconf.h
-index ca2849b..bc8c17b 100644
---- a/src/mod/languages/mod_lua/lua/luaconf.h
+--- a/src/mod/languages/mod_lua/lua/luaconf.h.orig
+++ b/src/mod/languages/mod_lua/lua/luaconf.h
-@@ -95,13 +95,18 @@
+@@ -101,13 +101,18 @@
- #else
+ #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
#define LUA_ROOT "/usr/local/"
+#define LUA_ROOT2 "/usr/"
- #define LUA_LDIR LUA_ROOT "share/lua/5.1/"
-+#define LUA_LDIR2 LUA_ROOT2 "share/lua/5.1/"
- #define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
-+#define LUA_CDIR2 LUA_ROOT2 "lib/lua/5.1/"
+ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
++#define LUA_LDIR2 LUA_ROOT2 "share/lua/" LUA_VDIR
+ #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
++#define LUA_CDIR2 LUA_ROOT2 "lib/lua/" LUA_VDIR
#define LUA_PATH_DEFAULT \
- "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
-- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua"
-+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
-+ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua"
+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
+- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua"
++ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua" \
++ LUA_LDIR2"?.lua;" LUA_LDIR2"?/init.lua"
#define LUA_CPATH_DEFAULT \
-- "./?.so;" "./lib?51.so;" LUA_CDIR"?.so;" LUA_CDIR"lib?51.so;" LUA_CDIR"loadall.so"
-+ "./?.so;" LUA_CDIR"?.so;" LUA_CDIR2"?.so;" LUA_CDIR"loadall.so"
-+
- #endif
+- LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
++ LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so" \
++ LUA_CDIR2"?.so;"
+ #endif /* } */
---
-1.7.1
-