From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 22 Nov 2016 23:04:45 +0000 (+0200)
Subject: workaround x32 -Werror
X-Git-Tag: auto/th/memcached-1.4.33-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=70b0f7eece863bb5b54e2018d171adc6c2fc1622;hp=e63ff5d7a2e43ac35188a85fd592919e5d306265;p=packages%2Fmemcached.git

workaround x32 -Werror
---

diff --git a/memcached.spec b/memcached.spec
index 052a83c..802d315 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -2,11 +2,11 @@
 # - release notes: https://github.com/memcached/memcached/wiki/ReleaseNotes
 # TODO
 # - fix x32 build failure:
-#items.c: In function 'item_cachedump':
-#items.c:464:24: error: format '%lu' expects argument of type 'long unsigned int', but argument 6 has type 'time_t' [-Werror=format=]
-#                        (unsigned long)it->exptime + process_started);
-#                        ^
-#items.c:464:24: error: format '%lu' expects argument of type 'long unsigned int', but argument 6 has type 'time_t' [-Werror=format=]
+#crawler.c: In function 'crawler_metadump_eval':
+#crawler.c:229:13: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'time_t {aka long long int}' [-Wformat=]
+#             "key=%s exp=%ld la=%llu cas=%llu fetch=%s\n",
+#             ^
+#crawler.c:229:13: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'time_t {aka long long int}' [-Wformat=]
 
 # Conditional build:
 %bcond_with		repcached		# repcached support, http://repcached.lab.klab.org/
@@ -15,7 +15,7 @@ Summary:	A high-performance, distributed memory object caching system
 Summary(pl.UTF-8):	Rozproszony, wysokiej wydajności system cache'owania obiektów
 Name:		memcached
 Version:	1.4.33
-Release:	0.1
+Release:	1
 License:	BSD
 Group:		Networking/Daemons
 Source0:	http://www.memcached.org/files/%{name}-%{version}.tar.gz
@@ -54,6 +54,10 @@ Rozproszony, wysokiej wydajności system cache'owania obiektów.
 
 sed -nie '1,/^$/p' ChangeLog
 
+%ifarch x32
+%{__sed} -i -e 's/-Werror//' configure.ac
+%endif
+
 %build
 %{__aclocal}
 %{__autoconf}