Attachment #177642 for bug #215031

View | Details | Raw Unified | Return to bug 215031
Collapse All | Expand All

Lines 19-24 Link Here

(-)zerotier/Makefile (+5 lines)
19	GH_PROJECT= ZeroTierOne	19	GH_PROJECT= ZeroTierOne
20	CFLAGS+= -flax-vector-conversions	20	CFLAGS+= -flax-vector-conversions
		21	OPTIONS_DEFINE= CONTROLLER
		22	CONTROLLER_DESC= Enable controller microservice to create and manage networks
		23	CONTROLLER_MAKE_ARGS= ZT_ENABLE_NETWORK_CONTROLLER=1
		24	CONTROLLER_BUILD_DEPENDS= sqlite3:databases/sqlite3
		25
21	PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one	26	PLIST_FILES= bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one
22	do-install:	27	do-install:




--- make-freebsd.mk.orig	2016-09-03 14:18:11.671935000 +0000
+++ make-freebsd.mk	2016-09-03 14:18:27.316065000 +0000
@@ -18,6 +18,14 @@
 	DEFS+=-DZT_ENABLE_CLUSTER
 endif
+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller
+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
+        DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
+        INCLUDES+=-I/usr/local/include
+        LDFLAGS+=-L/usr/local/lib -lsqlite3
+        OBJS+=controller/SqliteNetworkController.o
+endif
+
 # "make debug" is a shortcut for this
 ifeq ($(ZT_DEBUG),1)
 	DEFS+=-DZT_TRACE


Return to bug 215031

Line 0 Link Here

(-)zerotier/files/patch-make-freebsd.mk (+17 lines)
	1	--- make-freebsd.mk.orig 2016-09-03 14:18:11.671935000 +0000
	2	+++ make-freebsd.mk 2016-09-03 14:18:27.316065000 +0000
	3	@@ -18,6 +18,14 @@
	4	DEFS+=-DZT_ENABLE_CLUSTER
	5	endif
	6	+# Build with ZT_ENABLE_NETWORK_CONTROLLER=1 to build with the Sqlite network controller
	7	+ifeq ($(ZT_ENABLE_NETWORK_CONTROLLER),1)
	8	+ DEFS+=-DZT_ENABLE_NETWORK_CONTROLLER
	9	+ INCLUDES+=-I/usr/local/include
	10	+ LDFLAGS+=-L/usr/local/lib -lsqlite3
	11	+ OBJS+=controller/SqliteNetworkController.o
	12	+endif
	13	+
	14	# "make debug" is a shortcut for this
	15	ifeq ($(ZT_DEBUG),1)
	16	DEFS+=-DZT_TRACE
	17