commit: fce0568fa67ab299104e44cd1a414276302c71ff Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Feb 20 08:21:49 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 22:43:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce0568f
net-proxy/nutcracker: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/19552 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../nutcracker-0.2.4-use-system-libyaml.patch | 64 ---------------------- 1 file changed, 64 deletions(-) diff --git a/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch b/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch deleted file mode 100644 index 5cf7b3660bd..00000000000 --- a/net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -uNr nutcracker-0.2.4.orig/Makefile.am nutcracker-0.2.4/Makefile.am ---- nutcracker-0.2.4.orig/Makefile.am 2013-09-11 10:11:19.869975912 -0400 -+++ nutcracker-0.2.4/Makefile.am 2013-09-11 10:11:36.709975757 -0400 -@@ -2,6 +2,6 @@ - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = contrib src -+SUBDIRS = src - - EXTRA_DIST = README.md NOTICE LICENSE ChangeLog conf scripts notes -diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am ---- nutcracker-0.2.4.orig/src/Makefile.am 2013-09-11 10:16:16.449973187 -0400 -+++ nutcracker-0.2.4/src/Makefile.am 2013-09-11 10:16:44.019972934 -0400 -@@ -3,7 +3,6 @@ - AM_CPPFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE - AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit - AM_CPPFLAGS += -I $(top_srcdir)/src/proto --AM_CPPFLAGS += -I $(top_srcdir)/contrib/yaml-0.1.4/include - - AM_CFLAGS = -Wall -Wshadow - AM_CFLAGS += -Wpointer-arith -@@ -43,4 +42,3 @@ - - nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a - nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a --nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.1.4/src/.libs/libyaml.a -diff -uNr nutcracker-0.2.4.orig/configure.ac nutcracker-0.2.4/configure.ac ---- nutcracker-0.2.4.orig/configure.ac 2013-09-11 10:23:27.879969223 -0400 -+++ nutcracker-0.2.4/configure.ac 2013-09-11 10:24:28.729968664 -0400 -@@ -138,11 +138,7 @@ - [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])]) - AC_MSG_RESULT($disable_stats) - --# Untar the yaml-0.1.4 in contrib/ before config.status is rerun --AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.1.4.tar.gz -C contrib]) -- --# Call yaml-0.1.4 ./configure recursively --AC_CONFIG_SUBDIRS([contrib/yaml-0.1.4]) -+PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1]) - - # Define Makefiles - AC_CONFIG_FILES([Makefile -diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am ---- nutcracker-0.2.4.orig/src/Makefile.am 2013-09-11 10:23:27.879969223 -0400 -+++ nutcracker-0.2.4/src/Makefile.am 2013-09-11 10:26:16.549967674 -0400 -@@ -11,8 +11,9 @@ - AM_CFLAGS += -Wno-unused-parameter -Wno-unused-value - AM_CFLAGS += -Wconversion -Wsign-compare - AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -+AM_CFLAGS += $(YAML_CFLAGS) - --AM_LDFLAGS = -lm -lpthread -rdynamic -+AM_LDFLAGS = -lm -lpthread -rdynamic $(YAML_LIBS) - - SUBDIRS = hashkit proto - -@@ -40,5 +41,5 @@ - nc_queue.h \ - nc.c - --nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a -+nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a - nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
