Accepting request 791174 from home:darix:branches:network:utilities
- disable extstore also on ppc(64) - apply patch from https://github.com/memcached/memcached/pull/634 fix building with LTO and also building with -fno-common. OBS-URL: https://build.opensuse.org/request/show/791174 OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=70
This commit is contained in:
parent
647b1df213
commit
5a09d25fba
59
634.patch
Normal file
59
634.patch
Normal file
@ -0,0 +1,59 @@
|
||||
From aba4ffb5fce37ba6d2977c190592fd35ad7f3462 Mon Sep 17 00:00:00 2001
|
||||
From: Kanak Kshetri <kanakkshetri@fastmail.fm>
|
||||
Date: Wed, 1 Apr 2020 07:34:16 -0500
|
||||
Subject: [PATCH] testapp: Fix failure with -flto=auto
|
||||
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
testapp.c | 11 +++++------
|
||||
2 files changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 0d30161e7..d62facfce 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -4,7 +4,7 @@ noinst_PROGRAMS = memcached-debug sizes testapp timedrun
|
||||
|
||||
BUILT_SOURCES=
|
||||
|
||||
-testapp_SOURCES = testapp.c util.c util.h stats_prefix.c stats_prefix.h jenkins_hash.c murmur3_hash.c hash.c hash.h cache.c
|
||||
+testapp_SOURCES = testapp.c util.c util.h stats_prefix.c stats_prefix.h jenkins_hash.c murmur3_hash.c hash.h cache.c
|
||||
|
||||
timedrun_SOURCES = timedrun.c
|
||||
|
||||
diff --git a/testapp.c b/testapp.c
|
||||
index fffed794e..193adda86 100644
|
||||
--- a/testapp.c
|
||||
+++ b/testapp.c
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "config.h"
|
||||
#include "cache.h"
|
||||
#include "hash.h"
|
||||
+#include "jenkins_hash.h"
|
||||
#include "stats_prefix.h"
|
||||
#include "util.h"
|
||||
#include "protocol_binary.h"
|
||||
@@ -42,10 +43,7 @@ struct conn {
|
||||
ssize_t (*write)(struct conn *c, const void *buf, size_t count);
|
||||
};
|
||||
|
||||
-struct settings {
|
||||
- char *hash_algorithm;
|
||||
-};
|
||||
-struct settings settings;
|
||||
+hash_func hash;
|
||||
|
||||
static ssize_t tcp_read(struct conn *c, void *buf, size_t count);
|
||||
static ssize_t tcp_write(struct conn *c, const void *buf, size_t count);
|
||||
@@ -2306,8 +2304,9 @@ int main(int argc, char **argv)
|
||||
enable_ssl = true;
|
||||
}
|
||||
#endif
|
||||
- /* Stats prefix test is sensitive to the choice of hash function */
|
||||
- hash_init(JENKINS_HASH);
|
||||
+ /* Initialized directly instead of using hash_init to avoid pulling in
|
||||
+ the definition of settings struct from memcached.h */
|
||||
+ hash = jenkins_hash;
|
||||
stats_prefix_init(':');
|
||||
|
||||
for (num_cases = 0; testcases[num_cases].description; num_cases++) {
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 1 23:59:38 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
- disable extstore also on ppc(64)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 1 23:26:11 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
- apply patch from https://github.com/memcached/memcached/pull/634
|
||||
fix building with LTO and also building with -fno-common.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 26 01:22:59 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
|
@ -40,6 +40,7 @@ Source2: %{name}.sysconfig
|
||||
Source3: memcached-rpmlintrc
|
||||
Source4: memcached.service
|
||||
Patch: https://patch-diff.githubusercontent.com/raw/memcached/memcached/pull/635.patch
|
||||
Patch1: https://patch-diff.githubusercontent.com/raw/memcached/memcached/pull/634.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
@ -90,9 +91,10 @@ This package contains development files
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%define _lto_cflags %{nil}
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
%if %{with tls}
|
||||
--enable-tls \
|
||||
@ -101,7 +103,7 @@ This package contains development files
|
||||
--enable-sasl-pwdb \
|
||||
--enable-seccomp \
|
||||
--disable-coverage \
|
||||
%ifarch s390 s390x
|
||||
%ifarch s390 s390x ppc ppc64
|
||||
--disable-extstore \
|
||||
%endif
|
||||
--bindir=%{_sbindir}
|
||||
|
Loading…
Reference in New Issue
Block a user