Accepting request 172388 from devel:libraries:c_c++

More fixes for sasl linking... with this, collectd finally builds (forwarded request 172385 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/172388
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmemcached?expand=0&rev=18

libmemcached-pthread.patch

@@ -0,0 +1,14 @@
+=== modified file 'm4/ax_pthread.m4'
+--- m4/ax_pthread.m4	2012-07-27 04:00:47 +0000
++++ m4/ax_pthread.m4	2012-11-09 03:56:45 +0000
+@@ -123,7 +123,7 @@
+ # which indicates that we try without any flags at all, and "pthread-config"
+ # which is a program returning the flags for the Pth emulation library.
+ 
+-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -lpthread -lpthreads -mthreads pthread --thread-safe -mt pthread-config"
+ 
+ # The ordering *is* (sometimes) important.  Some notes on the
+ # individual items follow:
+
+

libmemcached.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Apr 18 20:55:07 UTC 2013 - dimstar@opensuse.org
+
+- Add libmemcached-pthread.patch: fix linking agains pthread:
+  when built with SASL support, libmemcached.so needs to be linked
+  against libpthread, or we have undefined symbols in the library.
+- Add libtool BuildRequires and call autorecon, as above patch
+  requires to boostrap.
+
+-------------------------------------------------------------------
+Sat Apr 13 21:53:59 UTC 2013 - dimstar@opensuse.org
+
+- Add cyrus-sasl-devel Requires: memcached.h includes (from its own
+  headers) struct/sasl.h, which in turn includes sasl/sasl.h. This
+  header comes from cyrus-sasl-devel.
+
 -------------------------------------------------------------------
 Mon Feb  4 21:25:25 UTC 2013 - chris@computersalat.de
 

libmemcached.spec

@@ -27,6 +27,8 @@ Url:            http://libmemcached.org
 Source0:        https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz 
 Source1:        https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
+# PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection
+Patch0:         libmemcached-pthread.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # List of additional build dependencies
 BuildRequires:  bison
@@ -34,6 +36,7 @@ BuildRequires:  cyrus-sasl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gpg-offline
 BuildRequires:  libevent-devel
+BuildRequires:  libtool
 BuildRequires:  memcached
 BuildRequires:  pkgconfig
 # needed for man pages
@@ -78,6 +81,8 @@ Summary:        Libmemcached is a C and C++ client library to the memcached serv
 Group:          Development/Libraries/C and C++
 Requires:       %{libsoname} = %{version}
 Requires:       %{name} = %{version}
+# memcached.h includes memcached-1.0/struct/sasl.h, which in turn includes sasl/sasl.h
+Requires:       cyrus-sasl-devel
 Requires:       glibc-devel
 Requires:       libmemcachedutil2 = %{version}
 
@@ -90,15 +95,15 @@ methods.
 %prep
 %gpg_verify %{S:1}
 %setup -q
+%patch0
 
 %build
-#autoreconf -fiv
+autoreconf -fiv
 %configure \
   --disable-static \
   --enable-libmemcachedprotocol \
   --with-memcached=%{_sbindir}/memcached
 make %{?_smp_mflags}
-#make
 
 %install
 %makeinstall