[pkgsrc/trunk]: pkgsrc/www/nginx Fixed LuaJIT2 linking for the Lua module.

[imil <imil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa54c546cf58
branches:  trunk
changeset: 632375:fa54c546cf58
user:      imil <imil%pkgsrc.org@localhost>
date:      Wed Mar 26 13:31:22 2014 +0000

description:
Fixed LuaJIT2 linking for the Lua module.

diffstat:

 www/nginx/Makefile   |  4 ++--
 www/nginx/options.mk |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 8cc84fcd8588 -r fa54c546cf58 www/nginx/Makefile
--- a/www/nginx/Makefile        Wed Mar 26 13:30:56 2014 +0000
+++ b/www/nginx/Makefile        Wed Mar 26 13:31:22 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2014/03/21 21:41:19 imil Exp $
+# $NetBSD: Makefile,v 1.54 2014/03/26 13:31:22 imil Exp $
 
 DISTNAME=              nginx-1.4.7
-PKGREVISION=           4
+PKGREVISION=           5
 MAINTAINER=            joerg%NetBSD.org@localhost
 
 .include "../../www/nginx/Makefile.common"
diff -r 8cc84fcd8588 -r fa54c546cf58 www/nginx/options.mk
--- a/www/nginx/options.mk      Wed Mar 26 13:30:56 2014 +0000
+++ b/www/nginx/options.mk      Wed Mar 26 13:31:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.28 2014/03/21 21:41:19 imil Exp $
+# $NetBSD: options.mk,v 1.29 2014/03/26 13:31:22 imil Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
@@ -94,6 +94,9 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mluajit)
+.include "../../lang/LuaJIT2/buildlink3.mk"
+CONFIGURE_ENV+=                LUAJIT_LIB=${PREFIX}/lib
+CONFIGURE_ENV+=                LUAJIT_INC=${PREFIX}/include/luajit-2.0
 CONFIGURE_ARGS+=       --add-module=../${LUA}
 .endif
 .if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
@@ -101,8 +104,6 @@
 LUA_DISTFILE=          ${LUA}.tar.gz
 SITES.${LUA_DISTFILE}= http://ftp.NetBSD.org/pub/pkgsrc/distfiles/
 DISTFILES+=            ${LUA_DISTFILE}
-
-DEPENDS+=              LuaJIT2>=2.0.3:../../lang/LuaJIT2
 .endif
 
 .if !empty(PKG_OPTIONS:Mecho)