pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/haproxy Add lua option.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b339222e4c8
branches:  trunk
changeset: 354868:0b339222e4c8
user:      morr <morr%pkgsrc.org@localhost>
date:      Sun Nov 13 19:37:18 2016 +0000

description:
Add lua option.

Fixes PR pkg/51608.

diffstat:

 net/haproxy/Makefile   |   8 ++++++--
 net/haproxy/options.mk |  15 +++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r ba686f46e940 -r 0b339222e4c8 net/haproxy/Makefile
--- a/net/haproxy/Makefile      Sun Nov 13 16:03:31 2016 +0000
+++ b/net/haproxy/Makefile      Sun Nov 13 19:37:18 2016 +0000
@@ -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 @@
 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 -r ba686f46e940 -r 0b339222e4c8 net/haproxy/options.mk
--- a/net/haproxy/options.mk    Sun Nov 13 16:03:31 2016 +0000
+++ b/net/haproxy/options.mk    Sun Nov 13 19:37:18 2016 +0000
@@ -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 @@
 .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)



Home | Main Index | Thread Index | Old Index