[packages/memcached] workaround x32 -Werror

glen glen at pld-linux.org
Wed Nov 23 00:04:58 CET 2016


commit 70b0f7eece863bb5b54e2018d171adc6c2fc1622
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Nov 23 01:04:45 2016 +0200

    workaround x32 -Werror

 memcached.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
---
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}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/memcached.git/commitdiff/70b0f7eece863bb5b54e2018d171adc6c2fc1622



More information about the pld-cvs-commit mailing list