commit: 431e6c5a2bd991ae89390c8334936ce844774adf Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue May 5 12:58:45 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed May 6 11:51:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431e6c5a
net-misc/zerotier: remove unused patch Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/15652 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../zerotier-1.4.6-add-mk-ctlr-node-target.patch | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch deleted file mode 100644 index 0d19099865b..00000000000 --- a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/make-linux.mk b/make-linux.mk -index 9fd4f7b9..a7eb7f6a 100644 ---- a/make-linux.mk -+++ b/make-linux.mk -@@ -45,6 +45,12 @@ endif - # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems. - ONE_OBJS+=ext/http-parser/http_parser.o - -+ifeq ($(ZT_CONTROLLER),1) -+ #LIBS+=-lpq -lrabbitmq -+ #DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER -+ override DEFS+=-DZT_CONTROLLER -+endif -+ - # Build with address sanitization library for advanced debugging (clang) - ifeq ($(ZT_SANITIZE),1) - DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1 -@@ -331,6 +337,9 @@ official: FORCE - docker: FORCE - docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized . - -+controller-node: FORCE -+ make DEFS+="-DZT_CONTROLLER" one -+ - central-controller: FORCE - make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one -
