From 3dfa96cdf970cb4afb614d71b595ebbc738ed5bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Dec 2020 10:39:01 +0100 Subject: update to 1.1.0-beta1 sources from https://github.com/m6w6/libmemcached open https://github.com/m6w6/libmemcached/issues/97 cmake files path open https://github.com/m6w6/libmemcached/issues/98 soname open https://github.com/m6w6/libmemcached/issues/99 build warning open https://github.com/m6w6/libmemcached/issues/100 headers path --- libmemcached-sasl.patch | 62 ------------------------------------------------- 1 file changed, 62 deletions(-) delete mode 100644 libmemcached-sasl.patch (limited to 'libmemcached-sasl.patch') diff --git a/libmemcached-sasl.patch b/libmemcached-sasl.patch deleted file mode 100644 index 104f60b..0000000 --- a/libmemcached-sasl.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up libmemcached-0.44/libmemcached/include.am.sasl libmemcached-0.44/libmemcached/include.am ---- libmemcached-0.44/libmemcached/include.am.sasl 2010-10-02 16:34:33.000000000 +0200 -+++ libmemcached-0.44/libmemcached/include.am 2010-10-02 16:35:27.000000000 +0200 -@@ -149,7 +149,7 @@ libmemcached_libmemcachedprotocol_la_DEP - endif - - if HAVE_SASL --libmemcached_libmemcached_la_LDFLAGS+= $(LIBSASL) -+libmemcached_libmemcached_la_LIBADD += $(LTLIBSASL2) - libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c - endif - -diff -up libmemcached-0.44/support/libmemcached.pc.in.sasl libmemcached-0.44/support/libmemcached.pc.in ---- libmemcached-0.44/support/libmemcached.pc.in.sasl 2010-10-02 08:20:58.000000000 +0200 -+++ libmemcached-0.44/support/libmemcached.pc.in 2010-10-02 08:24:07.000000000 +0200 -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: libmemcached - Description: libmemcached C library. - Version: @VERSION@ --Libs: -L${libdir} -lmemcached -+Libs: @LTLIBSASL2@ -L${libdir} -lmemcached - Cflags: -I${includedir} ---- libmemcached-0.46/Makefile.in.orig 2011-02-19 17:54:29.000000000 +0100 -+++ libmemcached-0.46/Makefile.in 2011-02-19 17:54:51.000000000 +0100 -@@ -113,7 +113,7 @@ - @BUILD_BYTEORDER_TRUE@am__append_4 = libmemcached/libbyteorder.la - @BUILD_BYTEORDER_TRUE@am__append_5 = libmemcached/libbyteorder.la - @BUILD_BYTEORDER_TRUE@am__append_6 = libmemcached/libbyteorder.la --@HAVE_SASL_TRUE@am__append_7 = $(LIBSASL) -+@HAVE_SASL_TRUE@am__append_7 = $(LTLIBSASL2) - @HAVE_SASL_TRUE@am__append_8 = libmemcached/sasl.c - @HAVE_DTRACE_TRUE@am__append_9 = libmemcached/dtrace_probes.h - @HAVE_DTRACE_TRUE@am__append_10 = libmemcached/dtrace_probes.h -@@ -291,6 +291,7 @@ - $(am_libmemcached_libbyteorder_la_OBJECTS) - @BUILD_BYTEORDER_TRUE@am_libmemcached_libbyteorder_la_rpath = - am__DEPENDENCIES_1 = -+@HAVE_SASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) - am__libmemcached_libmemcached_la_SOURCES_DIST = \ - libmemcached/allocators.c libmemcached/analyze.c \ - libmemcached/auto.c libmemcached/behavior.c \ -@@ -396,7 +397,6 @@ - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - am_clients_memcapable_OBJECTS = clients/memcapable.$(OBJEXT) - clients_memcapable_OBJECTS = $(am_clients_memcapable_OBJECTS) --@HAVE_SASL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) - am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) clients/libutilities.la \ - libmemcached/libmemcached.la $(am__DEPENDENCIES_2) - clients_memcapable_DEPENDENCIES = $(am__DEPENDENCIES_3) \ -@@ -974,9 +974,10 @@ - libmemcached_libmemcached_la_LIBADD = $(LIBM) \ - libmemcached/libmemcachedcallbacks.la \ - libmemcached/libmemcachedinternal.la \ -- libhashkit/libhashkitinc.la $(am__append_5) $(am__append_13) -+ libhashkit/libhashkitinc.la $(am__append_5) $(am__append_7) \ -+ $(am__append_13) - libmemcached_libmemcached_la_LDFLAGS = ${AM_LDFLAGS} -version-info \ -- ${MEMCACHED_LIBRARY_VERSION} $(am__append_7) $(am__append_26) -+ ${MEMCACHED_LIBRARY_VERSION} $(am__append_26) - libmemcached_libmemcachedutil_la_SOURCES = \ - libmemcached/util/ping.c \ - libmemcached/util/pool.c \ -- cgit