diff options
Diffstat (limited to 'pkg/vis/patch/0001-Allow-building-lpeg-statically.patch')
| -rw-r--r-- | pkg/vis/patch/0001-Allow-building-lpeg-statically.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch new file mode 100644 index 00000000..025bfb41 --- /dev/null +++ b/pkg/vis/patch/0001-Allow-building-lpeg-statically.patch @@ -0,0 +1,54 @@ +From 7a20eee4766219a030f8f581713d9a2b04d2e0ea Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Fri, 18 Nov 2016 21:35:52 -0800 +Subject: [PATCH] Allow building lpeg statically + +--- + Makefile | 3 ++- + vis-lua.c | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 962fb7e..201c0c1 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,6 +16,7 @@ MANPREFIX ?= ${PREFIX}/man + VERSION = $(shell git describe --always 2>/dev/null || echo "0.2") + + CONFIG_LUA ?= 1 ++CONFIG_LUA_STATIC ?= 0 + CONFIG_ACL ?= 0 + CONFIG_SELINUX ?= 0 + +@@ -27,7 +28,7 @@ CFLAGS_VIS = $(CFLAGS_AUTO) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) $(CFLAGS_ACL) \ + $(CFLAGS_SELINUX) $(CFLAGS_LUA) $(CFLAGS_STD) + + CFLAGS_VIS += -DVIS_PATH=\"${SHAREPREFIX}/vis\" +-CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA} ++CFLAGS_VIS += -DCONFIG_LUA=${CONFIG_LUA} -DCONFIG_LUA_STATIC=${CONFIG_LUA_STATIC} + CFLAGS_VIS += -DCONFIG_SELINUX=${CONFIG_SELINUX} + CFLAGS_VIS += -DCONFIG_ACL=${CONFIG_ACL} + CFLAGS_VIS += ${CFLAGS_DEBUG} +diff --git a/vis-lua.c b/vis-lua.c +index 29e94ef..83d2e52 100644 +--- a/vis-lua.c ++++ b/vis-lua.c +@@ -1889,6 +1889,15 @@ void vis_lua_init(Vis *vis) { + vis->lua = L; + luaL_openlibs(L); + ++#if CONFIG_LUA_STATIC ++ extern int luaopen_lpeg(lua_State *L); ++ lua_getglobal(L, "package"); ++ lua_getfield(L, -1, "preload"); ++ lua_pushcfunction(L, luaopen_lpeg); ++ lua_setfield(L, -2, "lpeg"); ++ lua_pop(L, 2); ++#endif ++ + /* remove any relative paths from lua's default package.path */ + vis_lua_path_strip(vis); + +-- +2.10.2 + |