Accepting request 172385 from home:dimstar:branches:server:monitoring
More fixes for sasl linking... with this, collectd finally builds OBS-URL: https://build.opensuse.org/request/show/172385 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=38
This commit is contained in:
parent
53e25a80dc
commit
609988b84b
14
libmemcached-pthread.patch
Normal file
14
libmemcached-pthread.patch
Normal file
@ -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:
|
||||||
|
|
||||||
|
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Sat Apr 13 21:53:59 UTC 2013 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ Url: http://libmemcached.org
|
|||||||
Source0: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz
|
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
|
Source1: https://launchpad.net/libmemcached/1.0/%{version}/+download/libmemcached-%{version}.tar.gz.asc
|
||||||
Source2: %{name}.keyring
|
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
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
# List of additional build dependencies
|
# List of additional build dependencies
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
@ -34,6 +36,7 @@ BuildRequires: cyrus-sasl-devel
|
|||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gpg-offline
|
BuildRequires: gpg-offline
|
||||||
BuildRequires: libevent-devel
|
BuildRequires: libevent-devel
|
||||||
|
BuildRequires: libtool
|
||||||
BuildRequires: memcached
|
BuildRequires: memcached
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
# needed for man pages
|
# needed for man pages
|
||||||
@ -92,15 +95,15 @@ methods.
|
|||||||
%prep
|
%prep
|
||||||
%gpg_verify %{S:1}
|
%gpg_verify %{S:1}
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
#autoreconf -fiv
|
autoreconf -fiv
|
||||||
%configure \
|
%configure \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--enable-libmemcachedprotocol \
|
--enable-libmemcachedprotocol \
|
||||||
--with-memcached=%{_sbindir}/memcached
|
--with-memcached=%{_sbindir}/memcached
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
#make
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%makeinstall
|
%makeinstall
|
||||||
|
Loading…
Reference in New Issue
Block a user