svn commit: r443019 - in head/databases/libmemcached: . files
Matthew Seaman
matthew at FreeBSD.org
Fri Jun 9 16:45:36 UTC 2017
Author: matthew
Date: Fri Jun 9 16:45:34 2017
New Revision: 443019
URL: https://svnweb.freebsd.org/changeset/ports/443019
Log:
Fix the build of libmemcached: add -lthr to the libraries
plus modifications to the autoconf files.
PR: 219168
Submitted by: m.tsatsenko at gmail.com (maintainer)
Reported by: 000.fbsd at quip.cz
Approved by: m.tsatsenko at gmail.com (maintainer)
Added:
head/databases/libmemcached/files/patch-m4_ax__debug.m4 (contents, props changed)
head/databases/libmemcached/files/patch-util_log.hpp (contents, props changed)
Deleted:
head/databases/libmemcached/files/patch-bug1400560
head/databases/libmemcached/files/patch-log.hpp
Modified:
head/databases/libmemcached/Makefile
head/databases/libmemcached/files/patch-bug1245562
head/databases/libmemcached/files/patch-libmemcached_assert.hpp
head/databases/libmemcached/files/patch-libtest_lite.h
Modified: head/databases/libmemcached/Makefile
==============================================================================
--- head/databases/libmemcached/Makefile Fri Jun 9 16:38:39 2017 (r443018)
+++ head/databases/libmemcached/Makefile Fri Jun 9 16:45:34 2017 (r443019)
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --without-memcached \
--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
Modified: head/databases/libmemcached/files/patch-bug1245562
==============================================================================
--- head/databases/libmemcached/files/patch-bug1245562 Fri Jun 9 16:38:39 2017 (r443018)
+++ head/databases/libmemcached/files/patch-bug1245562 Fri Jun 9 16:45:34 2017 (r443019)
@@ -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 @@ index 8bd0dbf..cdba743 100644
{
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
Modified: head/databases/libmemcached/files/patch-libmemcached_assert.hpp
==============================================================================
--- head/databases/libmemcached/files/patch-libmemcached_assert.hpp Fri Jun 9 16:38:39 2017 (r443018)
+++ head/databases/libmemcached/files/patch-libmemcached_assert.hpp Fri Jun 9 16:45:34 2017 (r443019)
@@ -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
Modified: head/databases/libmemcached/files/patch-libtest_lite.h
==============================================================================
--- head/databases/libmemcached/files/patch-libtest_lite.h Fri Jun 9 16:38:39 2017 (r443018)
+++ head/databases/libmemcached/files/patch-libtest_lite.h Fri Jun 9 16:45:34 2017 (r443019)
@@ -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)
Added: head/databases/libmemcached/files/patch-m4_ax__debug.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/libmemcached/files/patch-m4_ax__debug.m4 Fri Jun 9 16:45:34 2017 (r443019)
@@ -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"])])
Added: head/databases/libmemcached/files/patch-util_log.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/libmemcached/files/patch-util_log.hpp Fri Jun 9 16:45:34 2017 (r443019)
@@ -0,0 +1,10 @@
+--- util/log.hpp.orig 2014-02-09 11:52:42 UTC
++++ util/log.hpp
+@@ -42,6 +42,7 @@
+ #include <fcntl.h>
+ #include <iostream>
+ #include <string>
++#include <string.h>
+ #include <syslog.h>
+
+ #define UTIL_MAX_ERROR_SIZE 2048
More information about the svn-ports-head
mailing list