From adc6f93f9fb0b8a40074e191d2f6d9121685c171 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 7 Feb 2012 07:39:37 +0100 Subject: [PATCH] nginx: added lua module addon support --- network/nginx/config.in | 5 +++++ network/nginx/nginx.conf | 15 +++++++++++++++ network/nginx/nginx.desc | 1 + 3 files changed, 21 insertions(+) diff --git a/network/nginx/config.in b/network/nginx/config.in index 84c053241..c36f37065 100644 --- a/network/nginx/config.in +++ b/network/nginx/config.in @@ -29,6 +29,11 @@ if pkgcheck nginx X; then # nginx devel kit bool "Nginx Development Kit (NDK)" SDECFG_PKG_NGINX_ADDON_MOD_NDK 0 + # lua module + if pkgcheck lua X -o pkgcheck luajit X; then + bool "Lua Module" SDECFG_PKG_NGINX_ADDON_MOD_LUA 0 + fi + menu_end fi diff --git a/network/nginx/nginx.conf b/network/nginx/nginx.conf index 8459078ad..9c67814e5 100644 --- a/network/nginx/nginx.conf +++ b/network/nginx/nginx.conf @@ -127,3 +127,18 @@ fi if [ "$SDECFG_PKG_NGINX_ADDON_MOD_NDK" == 1 ] ; then hook_add prepatch 5 "pkg_nginx_add_module ngx_devel_kit" fi + +if [ "$SDECFG_PKG_NGINX_ADDON_MOD_LUA" == 1 ] ; then + # prefer to use luajit if available + if pkginstalled -f luajit; then + pkgprefix -t luajit + var_append configprefix ' ' "LUAJIT_LIB=$( pkgprefix -r libdir luajit )" + var_append configprefix ' ' "LUAJIT_INC=$( pkgprefix -r includedir luajit )" + else + pkgprefix -t lua + var_append configprefix ' ' "LUA_LIB=$( pkgprefix -r libdir lua )" + var_append configprefix ' ' "LUA_INC=$( pkgprefix -r includedir lua )" + fi + + hook_add prepatch 5 "pkg_nginx_add_module lua-nginx-module" +fi diff --git a/network/nginx/nginx.desc b/network/nginx/nginx.desc index 35070d94f..e2748bf86 100644 --- a/network/nginx/nginx.desc +++ b/network/nginx/nginx.desc @@ -53,3 +53,4 @@ [D] 417317636 nginx_upload_module-2.2.0.tar.gz http://www.grid.net.ru/nginx/download/ [D] 1976311739 echo-nginx-module-v0.37rc4.tar.gz !https://github.com/agentzh/echo-nginx-module/tarball/v0.37rc4 [D] 2657180702 ngx_devel_kit-v0.2.17.tar.gz !https://github.com/simpl/ngx_devel_kit/tarball/v0.2.17 +[D] 1919597670 lua-nginx-module-v0.5.0rc3.tar.gz !https://github.com/chaoslawful/lua-nginx-module/tarball/v0.5.0rc3