diff options
Diffstat (limited to 'net-proxy/nutcracker')
| -rw-r--r-- | net-proxy/nutcracker/Manifest | 1 | ||||
| -rw-r--r-- | net-proxy/nutcracker/files/nutcracker-0.2.4-use-system-libyaml.patch | 64 |
2 files changed, 0 insertions, 65 deletions
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest index c3c44fb676c0..5d741d3edd0c 100644 --- a/net-proxy/nutcracker/Manifest +++ b/net-proxy/nutcracker/Manifest @@ -1,4 +1,3 @@ -AUX nutcracker-0.2.4-use-system-libyaml.patch 2570 BLAKE2B 74052f28294eeae1080a7f8afdb1c17c89147dd9c47289eb2fc0d3a90aaf31868c40c1462c1754d1f440580084606e978150720ef1d2bafaf1e3d1dfe06efd5c SHA512 a529872829318788d54b876800d940fdbb2d710bd092fe4b930bce3cfaf23116579d1a6f7ead8a181113713a654b34686ec7470d8198e7263aeb85e8b0f51d1d AUX nutcracker-0.3.0-use-system-libyaml.patch 2183 BLAKE2B ad2cdffe2f038bf6715714f02d66d4610abb0abed2b5664e501a00e0340c2f20d7a06835322fab0369fc4747cd08ff010f028ab705181f881eda0c5c7b1c0145 SHA512 b37037f9089f0bc3eec53916e204986674e14d806028672fa723a453e274fe64a6290c14aaaebcaabaf1237069a6563fb736af5919421573050fe1b006472937 AUX nutcracker.confd 271 BLAKE2B 5f8a19edd4841cbc8b86f14ec48b72a46be95f34050619a6e1d75b12a348c11dab9890f1bbfaceff262256977888c378d2eee2ffb8c7b5c97e75bcc9c6e61502 SHA512 491b0330fda3994bedc15a77e7b4f601a2a0c234298ff04ee088f0e4a9676864e0eb01e1532f2cb6fdf95cefe0b0b0cf39d84b0993cadff774e7721f22d8c752 AUX nutcracker.confd.2 272 BLAKE2B dfcfdfb4134ce0acfb126b1c7cb32062e47906dd68ed109a4e9edbae9c56f4b1ae17b20f593ef5af904bbe85837f5bb9ff91e0e068acfdff82e949b623abb55a SHA512 d208654b1e1fd20f456f340fabe25836c8ba948c96db8034d41710f9e0362936a24f0faec89e51c04d478c60de5255c9d238ab00d7d7b778a0619061a8cbce4c 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 5cf7b3660bdf..000000000000 --- 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 |