Accepting request 265781 from devel:libraries:c_c++
1 OBS-URL: https://build.opensuse.org/request/show/265781 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmemcached?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
30d24485b9
35
libmemcached-automake1_14.diff
Normal file
35
libmemcached-automake1_14.diff
Normal 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])])
|
||||
32
libmemcached-no-docs-available.patch
Normal file
32
libmemcached-no-docs-available.patch
Normal file
@ -0,0 +1,32 @@
|
||||
Index: libmemcached-1.0.18/Makefile.am
|
||||
===================================================================
|
||||
--- libmemcached-1.0.18.orig/Makefile.am
|
||||
+++ libmemcached-1.0.18/Makefile.am
|
||||
@@ -26,6 +26,10 @@ EXTRA_DIST=
|
||||
dist_man_MANS=
|
||||
MAINTAINERCLEANFILES=
|
||||
|
||||
+if IS_VCS_CHECKOUT
|
||||
+SUBDIRS= docs
|
||||
+endif
|
||||
+
|
||||
#includes additional rules from aminclude.am
|
||||
@INC_AMINCLUDE@
|
||||
|
||||
@@ -57,7 +61,6 @@ endif
|
||||
include libmemcachedutil-1.0/include.am
|
||||
|
||||
include clients/include.am
|
||||
-include docs/include.am
|
||||
include man/include.am
|
||||
|
||||
if BUILD_LIBMEMCACHED_PROTOCOL
|
||||
@@ -103,7 +106,7 @@ merge-clean:
|
||||
@echo "Files that need to be either removed or checked in:"
|
||||
@bzr unknowns
|
||||
|
||||
-clean-local: clean-libtest-check clean-docs-check clean-rpm
|
||||
+clean-local: clean-libtest-check clean-rpm
|
||||
|
||||
|
||||
lcov: lcov-clean check
|
||||
@ -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.
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 16 17:31:06 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
- Add libmemcached-no-docs-available.patch: Do not build
|
||||
documentation if this is not a VC checkout. The idea is that the
|
||||
tarballs do only ship the pre-built documentation (which, on the
|
||||
other hand, is also missing in 1.0.18).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -29,6 +29,9 @@ 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
|
||||
# PATCH-FIX-UPSTREAM libmemcached-no-docs-available.patch dimstar@opensuse.org -- Do not build docs if not VCS checkout
|
||||
Patch2: libmemcached-no-docs-available.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# List of additional build dependencies
|
||||
BuildRequires: automake >= 1.13
|
||||
@ -41,7 +44,6 @@ BuildRequires: memcached
|
||||
BuildRequires: pkgconfig
|
||||
# needed for man pages
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gpg-offline
|
||||
BuildRequires: python-Sphinx
|
||||
|
||||
%description
|
||||
@ -90,9 +92,9 @@ 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
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
||||
Loading…
Reference in New Issue
Block a user