diff options
| author | imil <imil@pkgsrc.org> | 2014-03-26 13:31:22 +0000 |
|---|---|---|
| committer | imil <imil@pkgsrc.org> | 2014-03-26 13:31:22 +0000 |
| commit | 169cf6a15db39ac7de3a212e3bcb957abd6adaa1 (patch) | |
| tree | 7dec1d6bea42e71d1ab23f3191c6cc9c1b1c9f14 | |
| parent | cce85a65b904bd55e2e7d14f3d069a619f085bb0 (diff) | |
| download | pkgsrc-169cf6a15db39ac7de3a212e3bcb957abd6adaa1.tar.gz | |
Fixed LuaJIT2 linking for the Lua module.
| -rw-r--r-- | www/nginx/Makefile | 4 | ||||
| -rw-r--r-- | www/nginx/options.mk | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 4a5df5d1038..51ae74b4972 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -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 .include "../../www/nginx/Makefile.common" diff --git a/www/nginx/options.mk b/www/nginx/options.mk index bddbea9f5fd..855fd1bb487 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -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 @@ DISTFILES+= ${NDK_DISTFILE} .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= lua-nginx-module-0.9.5 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) |