diff options
| author | morr <morr@pkgsrc.org> | 2016-11-13 19:37:18 +0000 |
|---|---|---|
| committer | morr <morr@pkgsrc.org> | 2016-11-13 19:37:18 +0000 |
| commit | 6633b18267f8008cd4a1103528659baa68d536ad (patch) | |
| tree | db678abaf75b609eca0a78a4a269509a106b56d5 /net | |
| parent | 523d113b42cce905e541670285820e224bea0244 (diff) | |
| download | pkgsrc-6633b18267f8008cd4a1103528659baa68d536ad.tar.gz | |
Add lua option.
Fixes PR pkg/51608.
Diffstat (limited to 'net')
| -rw-r--r-- | net/haproxy/Makefile | 8 | ||||
| -rw-r--r-- | net/haproxy/options.mk | 15 |
2 files changed, 19 insertions, 4 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 901af07ec90..4a53e864b2d 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2016/10/13 19:08:34 morr Exp $ +# $NetBSD: Makefile,v 1.30 2016/11/13 19:37:18 morr Exp $ DISTNAME= haproxy-1.6.9 +PKGREVISION= 1 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.6/src/ @@ -10,7 +11,10 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake -BUILD_MAKE_FLAGS+= TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib USE_ZLIB=1 +BUILD_MAKE_FLAGS+= TARGET=${TARGET} ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib \ + USE_ZLIB=1 \ + USE_REGPARM=1 + INSTALL_MAKE_FLAGS+= TARGET=${TARGET} INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX} INSTALL_MAKE_FLAGS+= DOCDIR=${PREFIX}/share/doc/${PKGBASE} diff --git a/net/haproxy/options.mk b/net/haproxy/options.mk index 3a68aa4c928..d64d2e74cf3 100644 --- a/net/haproxy/options.mk +++ b/net/haproxy/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2016/01/03 17:13:40 morr Exp $ +# $NetBSD: options.mk,v 1.5 2016/11/13 19:37:18 morr Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.haproxy -PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas +PKG_SUPPORTED_OPTIONS= pcre ssl deviceatlas lua PKG_SUGGESTED_OPTIONS= pcre ssl .include "../../mk/bsd.options.mk" @@ -15,6 +15,17 @@ BUILD_MAKE_FLAGS+= USE_PCRE=1 .endif ### +### Use LUA +### +.if !empty(PKG_OPTIONS:Mlua) +. include "../../lang/lua/luaversion.mk" +BUILD_MAKE_FLAGS+= USE_LUA=1 +BUILD_MAKE_FLAGS+= LUA_VERSION_ACCEPTED=53 +BUILD_MAKE_FLAGS+= LUA_INC=${PREFIX}/${LUA_INCDIR} +. include "../../lang/lua/buildlink3.mk" +.endif + +### ### Support DeviceAtlas detection. ### .if !empty(PKG_OPTIONS:Mpcre) && !empty(PKG_OPTIONS:Mdeviceatlas) |