pool/libmemcached
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 264564 from home:jengelh:branches:devel:libraries:c_c++

Browse Source 
let compilation pass beyond configure

OBS-URL: https://build.opensuse.org/request/show/264564
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmemcached?expand=0&rev=45
This commit is contained in:
Marcus Meissner 2014-12-10 14:11:35 +00:00 committed by Git OBS Bridge
parent c8dca23811
commit b9080a458a
4 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libmemcached-automake1_14.diff Normal file
View File

@ -0,0 +1,35 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-12-09 17:23:13.621597902 +0100
References: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19311
build: do not set compilers _too_ early / workaround automake regression
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: libmemcached-1.0.18/configure.ac
===================================================================
--- libmemcached-1.0.18.orig/configure.ac
+++ libmemcached-1.0.18/configure.ac
@@ -13,10 +13,6 @@ m4_include([version.m4])
AC_PREREQ([2.61])
AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
-# Setup the compilers early on
-AC_PROG_CC([cc gcc clang])
-AC_PROG_CXX([c++ g++ clang++])
-
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -61,6 +57,10 @@ LT_LIB_M
AC_SUBST([lt_cv_dlopen_libs])
+# Setup the compilers early on
+AC_PROG_CC([cc gcc clang])
+AC_PROG_CXX([c++ g++ clang++])
+
AC_PROG_CC_C99
AS_IF([test "x${ac_cv_prog_cc_c99}" == "xno"],[AC_MSG_ERROR([No c99 compatible compiler found])])

10
libmemcached-pthread.patch
View File

@ -1,8 +1,12 @@
=== modified file 'm4/ax_pthread.m4'
Index: m4/ax_pthread.m4
---
m4/ax_pthread.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: libmemcached-1.0.18/m4/ax_pthread.m4
===================================================================
--- m4/ax_pthread.m4.orig
+++ m4/ax_pthread.m4
--- libmemcached-1.0.18.orig/m4/ax_pthread.m4
+++ libmemcached-1.0.18/m4/ax_pthread.m4
@@ -123,7 +123,7 @@ fi
# 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.

8
libmemcached.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Dec 9 16:24:59 UTC 2014 - jengelh@inai.de
- Let signature verification happen through source validator
instead of gpg-offline in %prep
- Add libmemcached-automake1_14.diff to workaround an automake
regression. Rediff libmemcached-pthread.patch for -p1.
-------------------------------------------------------------------
Mon Mar 31 10:46:47 UTC 2014 - lars@linux-schulserver.de

5
libmemcached.spec
View File

@ -29,6 +29,7 @@ Source1: https://launchpad.net/libmemcached/1.0/%{version}/+download/libm
Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM libmemcached-pthread.patch lp#133614 dimstar@opensuse.org -- Fix pthread detection
Patch0: libmemcached-pthread.patch
Patch1: libmemcached-automake1_14.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# List of additional build dependencies
BuildRequires: automake >= 1.13
@ -41,7 +42,6 @@ BuildRequires: memcached
BuildRequires: pkgconfig
# needed for man pages
BuildRequires: fdupes
BuildRequires: gpg-offline
BuildRequires: python-Sphinx
%description
@ -90,9 +90,8 @@ memory usage, thread safe, and provide full access to server side
methods.
%prep
%gpg_verify %{S:1}
%setup -q
%patch0
%patch -P 0 -P 1 -p1
%build
autoreconf -fiv