Attachment #182520 for bug #219168

View | Details | Raw Unified | Return to bug 219168
Collapse All | Expand All

Lines 23-29 Link Here

(-)libmemcached/Makefile (-1 / +1 lines)
23	--without-sphinx-build \	23	--without-sphinx-build \
24	--enable-libmemcachedprotocol	24	--enable-libmemcachedprotocol
25		25
26	LIBS+= -L${LOCALBASE}/lib -lexecinfo	26	LIBS+= -L${LOCALBASE}/lib -lexecinfo -lthr
27	CXXFLAGS+= -D__STDC_CONSTANT_MACROS	27	CXXFLAGS+= -D__STDC_CONSTANT_MACROS
28		28
29	OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL	29	OPTIONS_DEFINE= DEBUG DTRACE MEMASLAP SASL

Lines 1-6 Link Here

(-)libmemcached/files/patch-bug1245562 (-6 / +2 lines)
1	diff --git a/clients/memflush.cc b/clients/memflush.cc	1	--- clients/memflush.cc.orig 2014-02-09 11:52:42 UTC
2	index 8bd0dbf..cdba743 100644
3	--- clients/memflush.cc
4	+++ clients/memflush.cc	2	+++ clients/memflush.cc
5	@@ -39,7 +39,7 @@ int main(int argc, char *argv[])	3	@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
6	{	4	{
Lines 20-28 Link Here
20	{	18	{
21	std::cerr << "No Servers provided" << std::endl;	19	std::cerr << "No Servers provided" << std::endl;
22	exit(EXIT_FAILURE);	20	exit(EXIT_FAILURE);
23	diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h	21	--- libmemcached-1.0/memcached.h.orig 2014-02-09 11:52:42 UTC
24	index bc16e73..dcee395 100644
25	--- libmemcached-1.0/memcached.h
26	+++ libmemcached-1.0/memcached.h	22	+++ libmemcached-1.0/memcached.h
27	@@ -43,7 +43,11 @@	23	@@ -43,7 +43,11 @@
28	#endif	24	#endif




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"])])

Lines 1-4 Link Here

(-)libmemcached/files/patch-libmemcached_assert.hpp (-1 / +1 lines)
1	--- libmemcached/assert.hpp.orig 2014-12-10 05:16:11 UTC	1	--- libmemcached/assert.hpp.orig 2014-02-09 11:52:42 UTC
2	+++ libmemcached/assert.hpp	2	+++ libmemcached/assert.hpp
3	@@ -51,8 +51,10 @@	3	@@ -51,8 +51,10 @@
4	# ifdef _WIN32	4	# ifdef _WIN32

Lines 1-4 Link Here

(-)libmemcached/files/patch-libtest_lite.h (-1 / +1 lines)
1	--- libtest/lite.h.orig 2014-12-09 03:34:21 UTC	1	--- libtest/lite.h.orig 2014-02-09 11:52:42 UTC
2	+++ libtest/lite.h	2	+++ libtest/lite.h
3	@@ -54,8 +54,10 @@	3	@@ -54,8 +54,10 @@
4	#if defined(WIN32)	4	#if defined(WIN32)

Lines 1-10 Link Here

(-)libmemcached/files/patch-log.hpp (-10 lines)
1	--- util/log.hpp.orig 2012-04-22 19:10:08.624721461 +0200
2	+++ util/log.hpp 2012-04-22 19:11:43.651275813 +0200
3	@@ -27,6 +27,7 @@
4	#include <fcntl.h>
5	#include <iostream>
6	#include <string>
7	+#include <string.h>
8	#include <syslog.h>
9
10	#define UTIL_MAX_ERROR_SIZE 2048




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"])])

Line 0 Link Here

(-)libmemcached/files/patch-util_log.hpp (+10 lines)
	1	--- util/log.hpp.orig 2014-02-09 11:52:42 UTC
	2	+++ util/log.hpp
	3	@@ -42,6 +42,7 @@
	4	#include <fcntl.h>
	5	#include <iostream>
	6	#include <string>
	7	+#include <string.h>
	8	#include <syslog.h>
	9
	10	#define UTIL_MAX_ERROR_SIZE 2048

Return to bug 219168

Lines 1-29 Link Here

(-)libmemcached/files/patch-bug1400560 (-29 lines)
1	Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified.
2	diff -ru libmemcached-1.0.18-orig/m4/ax_debug.m4 libmemcached-1.0.18/m4/ax_debug.m4
3	--- m4/ax_debug.m4 2014-11-05 14:43:53.720284916 -0600
4	+++ m4/ax_debug.m4 2014-11-19 14:23:19.512482198 -0600
5	@@ -49,16 +49,18 @@
6	[AC_PREREQ([2.63])dnl
7	AC_ARG_ENABLE([debug],
8	[AS_HELP_STRING([--enable-debug],
9	- [Add debug code/turns off optimizations (yes\|no) @<:@default=no@:>@])],
10	- [ax_enable_debug=yes
11	+ [Add debug code/turns off optimizations (yes\|no) @<:@default=no@:>@])])
12	+ AS_IF([test "x$enable_debug" = "xyes"], [
13	+ ax_enable_debug=yes
14	AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
15	AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
16	AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
17	- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
18	- [ax_enable_debug=no
19	+ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])
20	+ ], [
21	+ ax_enable_debug=no
22	AC_SUBST([MCHECK])
23	- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
24	-
25	+ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])
26	+ ])
27	AC_MSG_CHECKING([for debug])
28	AC_MSG_RESULT([$ax_enable_debug])
29	AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])

Line 0 Link Here

(-)libmemcached/files/patch-m4_ax__debug.m4 (+28 lines)
	1	Fixed a bug that caused configure to disobey the enable/disable debug flag. The debug flag will default to disabled if not specified.
	2	--- m4/ax_debug.m4.orig 2014-02-09 11:52:42 UTC
	3	+++ m4/ax_debug.m4
	4	@@ -49,16 +49,18 @@ AC_DEFUN([AX_DEBUG],
	5	[AC_PREREQ([2.63])dnl
	6	AC_ARG_ENABLE([debug],
	7	[AS_HELP_STRING([--enable-debug],
	8	- [Add debug code/turns off optimizations (yes\|no) @<:@default=no@:>@])],
	9	- [ax_enable_debug=yes
	10	+ [Add debug code/turns off optimizations (yes\|no) @<:@default=no@:>@])])
	11	+ AS_IF([test "x$enable_debug" = "xyes"], [
	12	+ ax_enable_debug=yes
	13	AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
	14	AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
	15	AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
	16	- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
	17	- [ax_enable_debug=no
	18	+ AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])
	19	+ ], [
	20	+ ax_enable_debug=no
	21	AC_SUBST([MCHECK])
	22	- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
	23	-
	24	+ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])
	25	+ ])
	26	AC_MSG_CHECKING([for debug])
	27	AC_MSG_RESULT([$ax_enable_debug])
	28	AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])