diff options
| author | Yagnesh Mistry <ysh@live.in> | 2015-10-22 01:32:34 +0530 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-04 09:48:58 +0000 |
| commit | 14113e0aa36b56f220344b668d9e49ac13627455 (patch) | |
| tree | 0509053c9f71cbbd92119ca874e8e88deaaab91f /testing/twemproxy/use-system-libyaml.patch | |
| parent | b87e908ccb951a69a50e22b433816a01f6ba0ee4 (diff) | |
| download | aports-14113e0aa36b56f220344b668d9e49ac13627455.tar.bz2 aports-14113e0aa36b56f220344b668d9e49ac13627455.tar.xz | |
testing/twemproxy: new aport
https://github.com/twitter/twemproxy
A fast, light-weight proxy for memcached and redis
Diffstat (limited to 'testing/twemproxy/use-system-libyaml.patch')
| -rw-r--r-- | testing/twemproxy/use-system-libyaml.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/testing/twemproxy/use-system-libyaml.patch b/testing/twemproxy/use-system-libyaml.patch new file mode 100644 index 0000000000..e3ec54a15a --- /dev/null +++ b/testing/twemproxy/use-system-libyaml.patch @@ -0,0 +1,60 @@ +--- twemproxy-0.4.1/Makefile.am ++++ twemproxy/src/twemproxy-0.4.1/Makefile.am +@@ -2,7 +2,7 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = contrib src ++SUBDIRS = src + + dist_man_MANS = man/nutcracker.8 + +--- twemproxy-0.4.1/configure.ac ++++ twemproxy/src/twemproxy-0.4.1/configure.ac +@@ -75,6 +75,14 @@ + # Checks for libraries + AC_CHECK_LIB([m], [pow]) + AC_CHECK_LIB([pthread], [pthread_create]) ++AC_CHECK_LIB([yaml], [yaml_get_version_string],,LIBYAML="no") ++if test "$LIBYAML" = "no"; then ++ echo ++ echo " Error: libyaml library not found." ++ echo " Run apk add yaml-dev" ++ echo ++ exit 1 ++fi + + # Checks for library functions + AC_FUNC_FORK +@@ -196,15 +204,8 @@ + [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]) +- + # Define Makefiles + AC_CONFIG_FILES([Makefile +- contrib/Makefile + src/Makefile + src/hashkit/Makefile + src/proto/Makefile +--- twemproxy-0.4.1/src/Makefile.am ++++ twemproxy/src/twemproxy-0.4.1/src/Makefile.am +@@ -21,7 +21,7 @@ + AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations + + AM_LDFLAGS = +-AM_LDFLAGS += -lm -lpthread -rdynamic ++AM_LDFLAGS += -lm -lpthread -lyaml -rdynamic + if OS_SOLARIS + AM_LDFLAGS += -lnsl -lsocket + endif +@@ -57,4 +57,3 @@ + nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a + nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a + nutcracker_LDADD += $(top_builddir)/src/event/libevent.a +-nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.1.4/src/.libs/libyaml.a |