github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-05 12:36:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.95.0.64/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2022-06-27 17:13:57 -04:00
commit 651f45fe29
685 changed files with 174376 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

16
make-linux.mk
View file

@ -302,9 +302,9 @@ endif
ifeq ($(ZT_CONTROLLER),1)
override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
override LDLIBS+=-L/usr/pgsql-10/lib/ -lpqxx -lpq ext/hiredis-0.14.1/lib/centos8/libhiredis.a ext/redis-plus-plus-1.1.1/install/centos8/lib/libredis++.a -lssl -lcrypto
override LDLIBS+=-Lext/libpqxx-7.7.3/install/ubuntu22.04/lib -lpqxx -lpq ext/hiredis-1.0.2/lib/ubuntu22.04/libhiredis.a ext/redis-plus-plus-1.3.3/install/ubuntu22.04/lib/libredis++.a -lssl -lcrypto
override DEFS+=-DZT_CONTROLLER_USE_LIBPQ
override INCLUDES+=-I/usr/pgsql-10/include -Iext/hiredis-0.14.1/include/ -Iext/redis-plus-plus-1.1.1/install/centos8/include/sw/
override INCLUDES+=-I/usr/include/postgresql -Iext/libpqxx-7.7.3/install/ubuntu22.04/include -Iext/hiredis-1.0.2/include/ -Iext/redis-plus-plus-1.3.3/install/ubuntu22.04/include/sw/
endif
# ARM32 hell -- use conservative CFLAGS
@ -498,17 +498,15 @@ snap-uninstall: FORCE
snap remove zerotier
snap-build-remote: FORCE
snapcraft remote-build --build-on=amd64,arm64,s390x,ppc64el,armhf,i386
cd pkg && snapcraft remote-build --build-on=amd64,arm64,s390x,ppc64el,armhf,i386
snap-upload-beta: FORCE
snapcraft login --with-file=snapcraft-login-data
pushd pkg
for SNAPFILE in ./*.snap; do\
snapcraft upload --release=beta,edge,candidate $${SNAPFILE};\
done
snap-upload-stable: FORCE
for SNAPFILE in ./*.snap; do\
snapcraft upload --release=stable $${SNAPFILE};\
snapcraft upload --release=stable,beta,edge,candidate $${SNAPFILE};\
done
popd
synology-pkg: FORCE
cd pkg/synology ; ./build.sh build