Date: Tue, 7 Mar 2017 15:49:27 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435612 - in head/net/zerotier: . files Message-ID: <201703071549.v27FnR1X024553@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Mar 7 15:49:27 2017 New Revision: 435612 URL: https://svnweb.freebsd.org/changeset/ports/435612 Log: - Add an option to build network management controller microservice - Respect CC/CXX and drop superfluous GH_ACCOUNT while I'm at it PR: 215031 (modified) Approved by: maintainer timeout (since 2016-12-03) Added: head/net/zerotier/files/patch-make-freebsd.mk (contents, props changed) Modified: head/net/zerotier/Makefile Modified: head/net/zerotier/Makefile ============================================================================== --- head/net/zerotier/Makefile Tue Mar 7 15:28:19 2017 (r435611) +++ head/net/zerotier/Makefile Tue Mar 7 15:49:27 2017 (r435612) @@ -15,12 +15,17 @@ USES= gmake USE_RC_SUBR= zerotier USE_GITHUB= yes -GH_ACCOUNT= zerotier GH_PROJECT= ZeroTierOne CFLAGS+= -flax-vector-conversions PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one +OPTIONS_DEFINE= CONTROLLER + +CONTROLLER_DESC= Network management controller microservice support +CONTROLLER_USES= sqlite +CONTROLLER_MAKE_ARGS= ZT_ENABLE_NETWORK_CONTROLLER=1 + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/ .for l in zerotier-cli zerotier-idtool Added: head/net/zerotier/files/patch-make-freebsd.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/zerotier/files/patch-make-freebsd.mk Tue Mar 7 15:49:27 2017 (r435612) @@ -0,0 +1,25 @@ +--- make-freebsd.mk.orig 2016-07-22 03:29:15 UTC ++++ make-freebsd.mk +@@ -1,5 +1,5 @@ +-CC=cc +-CXX=c++ ++CC?=cc ++CXX?=c++ + + INCLUDES= + DEFS= +@@ -18,6 +18,14 @@ ifeq ($(ZT_ENABLE_CLUSTER),1) + DEFS+=-DZT_ENABLE_CLUSTER + endif + ++# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with SQLite network controller ++ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1) ++ DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER ++ INCLUDES+=-I$(LOCALBASE)/include ++ LDFLAGS+=-L$(LOCALBASE)/lib -lsqlite3 ++ OBJS+=controller/SqliteNetworkController.o ++endif ++ + # "make debug" is a shortcut for this + ifeq ($(ZT_DEBUG),1) + DEFS+=-DZT_TRACE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703071549.v27FnR1X024553>