diff -urN libmemcached.orig/Makefile libmemcached/Makefile --- libmemcached.orig/Makefile 2017-05-12 04:05:53.708841000 +0300 +++ libmemcached/Makefile 2017-05-12 04:23:10.596099000 +0300 @@ -23,7 +23,7 @@ --without-sphinx-build \ --enable-libmemcachedprotocol -LIBS+= -L${LOCALBASE}/lib -lexecinfo +LIBS+= -L${LOCALBASE}/lib -lexecinfo -lthr CXXFLAGS+= -D__STDC_CONSTANT_MACROS OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL diff -urN libmemcached.orig/files/patch-bug1245562 libmemcached/files/patch-bug1245562 --- libmemcached.orig/files/patch-bug1245562 2017-05-12 04:05:53.711332000 +0300 +++ libmemcached/files/patch-bug1245562 2017-05-12 04:21:23.607525000 +0300 @@ -1,6 +1,4 @@ -diff --git a/clients/memflush.cc b/clients/memflush.cc -index 8bd0dbf..cdba743 100644 ---- clients/memflush.cc +--- clients/memflush.cc.orig 2014-02-09 11:52:42 UTC +++ clients/memflush.cc @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { @@ -20,9 +18,7 @@ { std::cerr << "No Servers provided" << std::endl; exit(EXIT_FAILURE); -diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h -index bc16e73..dcee395 100644 ---- libmemcached-1.0/memcached.h +--- libmemcached-1.0/memcached.h.orig 2014-02-09 11:52:42 UTC +++ libmemcached-1.0/memcached.h @@ -43,7 +43,11 @@ #endif diff -urN libmemcached.orig/files/patch-bug1400560 libmemcached/files/patch-bug1400560 --- libmemcached.orig/files/patch-bug1400560 2017-05-12 04:05:53.711819000 +0300 +++ libmemcached/files/patch-bug1400560 1970-01-01 03:00:00.000000000 +0300 @@ -1,29 +0,0 @@ -Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified. -diff -ru libmemcached-1.0.18-orig/m4/ax_debug.m4 libmemcached-1.0.18/m4/ax_debug.m4 ---- m4/ax_debug.m4 2014-11-05 14:43:53.720284916 -0600 -+++ m4/ax_debug.m4 2014-11-19 14:23:19.512482198 -0600 -@@ -49,16 +49,18 @@ - [AC_PREREQ([2.63])dnl - AC_ARG_ENABLE([debug], - [AS_HELP_STRING([--enable-debug], -- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], -- [ax_enable_debug=yes -+ [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])]) -+ AS_IF([test "x$enable_debug" = "xyes"], [ -+ ax_enable_debug=yes - AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) - AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])]) - AX_ADD_AM_MACRO([--debug],[AM_YFLAGS]) -- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])], -- [ax_enable_debug=no -+ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS]) -+ ], [ -+ ax_enable_debug=no - AC_SUBST([MCHECK]) -- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])]) -- -+ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.]) -+ ]) - AC_MSG_CHECKING([for debug]) - AC_MSG_RESULT([$ax_enable_debug]) - AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])]) diff -urN libmemcached.orig/files/patch-libmemcached_assert.hpp libmemcached/files/patch-libmemcached_assert.hpp --- libmemcached.orig/files/patch-libmemcached_assert.hpp 2017-05-12 04:05:53.722450000 +0300 +++ libmemcached/files/patch-libmemcached_assert.hpp 2017-05-12 04:21:23.613730000 +0300 @@ -1,4 +1,4 @@ ---- libmemcached/assert.hpp.orig 2014-12-10 05:16:11 UTC +--- libmemcached/assert.hpp.orig 2014-02-09 11:52:42 UTC +++ libmemcached/assert.hpp @@ -51,8 +51,10 @@ # ifdef _WIN32 diff -urN libmemcached.orig/files/patch-libtest_lite.h libmemcached/files/patch-libtest_lite.h --- libmemcached.orig/files/patch-libtest_lite.h 2017-05-12 04:05:53.723449000 +0300 +++ libmemcached/files/patch-libtest_lite.h 2017-05-12 04:21:23.616834000 +0300 @@ -1,4 +1,4 @@ ---- libtest/lite.h.orig 2014-12-09 03:34:21 UTC +--- libtest/lite.h.orig 2014-02-09 11:52:42 UTC +++ libtest/lite.h @@ -54,8 +54,10 @@ #if defined(WIN32) diff -urN libmemcached.orig/files/patch-log.hpp libmemcached/files/patch-log.hpp --- libmemcached.orig/files/patch-log.hpp 2017-05-12 04:05:53.723853000 +0300 +++ libmemcached/files/patch-log.hpp 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@ ---- util/log.hpp.orig 2012-04-22 19:10:08.624721461 +0200 -+++ util/log.hpp 2012-04-22 19:11:43.651275813 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - #define UTIL_MAX_ERROR_SIZE 2048 diff -urN libmemcached.orig/files/patch-m4_ax__debug.m4 libmemcached/files/patch-m4_ax__debug.m4 --- libmemcached.orig/files/patch-m4_ax__debug.m4 1970-01-01 03:00:00.000000000 +0300 +++ libmemcached/files/patch-m4_ax__debug.m4 2017-05-12 04:21:23.620130000 +0300 @@ -0,0 +1,28 @@ +Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified. +--- m4/ax_debug.m4.orig 2014-02-09 11:52:42 UTC ++++ m4/ax_debug.m4 +@@ -49,16 +49,18 @@ AC_DEFUN([AX_DEBUG], + [AC_PREREQ([2.63])dnl + AC_ARG_ENABLE([debug], + [AS_HELP_STRING([--enable-debug], +- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])], +- [ax_enable_debug=yes ++ [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])]) ++ AS_IF([test "x$enable_debug" = "xyes"], [ ++ ax_enable_debug=yes + AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.]) + AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])]) + AX_ADD_AM_MACRO([--debug],[AM_YFLAGS]) +- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])], +- [ax_enable_debug=no ++ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS]) ++ ], [ ++ ax_enable_debug=no + AC_SUBST([MCHECK]) +- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])]) +- ++ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.]) ++ ]) + AC_MSG_CHECKING([for debug]) + AC_MSG_RESULT([$ax_enable_debug]) + AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])]) diff -urN libmemcached.orig/files/patch-util_log.hpp libmemcached/files/patch-util_log.hpp --- libmemcached.orig/files/patch-util_log.hpp 1970-01-01 03:00:00.000000000 +0300 +++ libmemcached/files/patch-util_log.hpp 2017-05-12 04:21:23.623306000 +0300 @@ -0,0 +1,10 @@ +--- util/log.hpp.orig 2014-02-09 11:52:42 UTC ++++ util/log.hpp +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + #include + + #define UTIL_MAX_ERROR_SIZE 2048