• file
• revisions
• annotate
• diff
• comparison
• raw

memcached/memcached.patch@5974eb964eec (annotated)

memcached/memcached.patch

Wed, 21 Sep 2011 14:13:05 +0200

author

Michael Schloh von Bennewitz <michael@schloh.com>

date

Wed, 21 Sep 2011 14:13:05 +0200

changeset 379

5974eb964eec

parent 378

16cc9d2eceb2

child 576

b3a1e74cc78b

permissions

-rw-r--r--

Backport RPM boilerplate logic required by legacy OpenPKG scripts,
and port build configuration to build correctly on SVR5.

michael@378	1	Index: libmemcached-0.48/Makefile.in
michael@378	2	--- libmemcached-0.48/Makefile.in.orig 2011-03-16 04:40:31.000000000 +0100
michael@378	3	+++ libmemcached-0.48/Makefile.in 2011-03-18 18:43:52.000000000 +0100
michael@378	4	@@ -95,10 +95,7 @@
michael@378	5	clients/memerror$(EXEEXT) clients/memflush$(EXEEXT) \
michael@378	6	clients/memrm$(EXEEXT) clients/memstat$(EXEEXT) \
michael@378	7	$(am__EXEEXT_1)
michael@378	8	-noinst_PROGRAMS = tests/atomsmasher$(EXEEXT) tests/hashplus$(EXEEXT) \
michael@378	9	- tests/memplus$(EXEEXT) tests/startservers$(EXEEXT) \
michael@378	10	- tests/testapp$(EXEEXT) tests/testhashkit$(EXEEXT) \
michael@378	11	- tests/testplus$(EXEEXT) tests/testudp$(EXEEXT) $(am__EXEEXT_3)
michael@378	12	+noinst_PROGRAMS =
michael@378	13	check_PROGRAMS = $(am__EXEEXT_2)
michael@378	14	@BUILD_DOCS_TRUE@am__append_1 = test-docs
michael@378	15	DIST_COMMON = README $(am__configure_deps) \
michael@378	16	@@ -138,7 +135,7 @@
michael@378	17	@DTRACE_NEEDS_OBJECTS_TRUE@am__append_13 = libmemcached/libmemcached_probes.o
michael@378	18	@DTRACE_NEEDS_OBJECTS_TRUE@am__append_14 = libmemcached/libmemcached_probes.o
michael@378	19	@HAVE_SASL_TRUE@am__append_15 = $(LIBSASL)
michael@378	20	-@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_16 = clients/memslap
michael@378	21	+@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__append_16 =
michael@378	22	@BUILD_BYTEORDER_TRUE@am__append_17 = libmemcached/libbyteorder.la
michael@378	23	@INCLUDE_HSIEH_SRC_TRUE@am__append_18 = libhashkit/hsieh.c
michael@378	24	@INCLUDE_MURMUR_SRC_TRUE@am__append_19 = libhashkit/murmur.c
michael@378	25	@@ -409,7 +406,7 @@
michael@378	26	libtest_libtest_la_LIBADD =
michael@378	27	am_libtest_libtest_la_OBJECTS = libtest/test.lo
michael@378	28	libtest_libtest_la_OBJECTS = $(am_libtest_libtest_la_OBJECTS)
michael@378	29	-@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 = clients/memslap$(EXEEXT)
michael@378	30	+@BUILD_WIN32_WRAPPERS_FALSE@@HAVE_LIBEVENT_TRUE@am__EXEEXT_1 =
michael@378	31	@HAVE_LIBGTEST_TRUE@am__EXEEXT_2 = unittests/unittests$(EXEEXT)
michael@378	32	@HAVE_LIBEVENT_TRUE@am__EXEEXT_3 = example/memcached_light$(EXEEXT)
michael@378	33	PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
michael@378	34	Index: libmemcached-0.48/configure
michael@378	35	--- libmemcached-0.48/configure.orig 2011-03-16 04:40:33.000000000 +0100
michael@378	36	+++ libmemcached-0.48/configure 2011-03-18 18:43:13.000000000 +0100
michael@378	37	@@ -17719,8 +17719,8 @@
michael@378	38
michael@378	39	fi
michael@378	40
michael@378	41	- CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}"
michael@378	42	- CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}"
michael@378	43	+ CC_WARNINGS="${BASE_WARNINGS} ${CC_WARNINGS_FULL}"
michael@378	44	+ CXX_WARNINGS="${BASE_WARNINGS} -Wnon-virtual-dtor -Wno-long-long ${CXX_WARNINGS_FULL}"
michael@378	45
michael@378	46	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to use -Wmissing-declarations from C++" >&5
michael@378	47	$as_echo_n "checking whether it is safe to use -Wmissing-declarations from C++... " >&6; }
michael@378	48	Index: libmemcached-0.48/support/libmemcached.pc.in
michael@378	49	--- libmemcached-0.48/support/libmemcached.pc.in.orig 2011-02-22 05:06:22.000000000 +0100
michael@378	50	+++ libmemcached-0.48/support/libmemcached.pc.in 2011-03-18 18:43:13.000000000 +0100
michael@378	51	@@ -8,3 +8,4 @@
michael@378	52	Version: @VERSION@
michael@378	53	Libs: @LTLIBSASL@ @LTLIBSASL2@ -L${libdir} -lmemcached
michael@378	54	Cflags: -I${includedir}
michael@378	55	+Requires: libevent sasl
michael@378	56	Index: memcached-1.4.6/configure
michael@378	57	--- memcached-1.4.6/configure.orig 2010-04-03 23:26:12.000000000 +0200
michael@378	58	+++ memcached-1.4.6/configure 2011-03-18 18:43:13.000000000 +0100
michael@378	59	@@ -7914,7 +7914,6 @@
michael@378	60	elif test "$GCC" = "yes"
michael@378	61	then
michael@378	62	GCC_VERSION=`$CC -dumpversion`
michael@378	63	- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
michael@378	64	case $GCC_VERSION in
michael@378	65	4.4.*)
michael@378	66	CFLAGS="$CFLAGS -fno-strict-aliasing"
michael@378	67	Index: memcached-1.4.6/thread.c
michael@378	68	--- memcached-1.4.6/thread.c.orig 2010-04-03 09:07:16.000000000 +0200
michael@378	69	+++ memcached-1.4.6/thread.c 2011-03-18 18:43:13.000000000 +0100
michael@378	70	@@ -602,6 +602,7 @@
michael@378	71	perror("Can't allocate thread descriptors");
michael@378	72	exit(1);
michael@378	73	}
michael@378	74	+ memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
michael@378	75
michael@378	76	dispatcher_thread.base = main_base;
michael@378	77	dispatcher_thread.thread_id = pthread_self();
michael@379	78	Index: libmemcache-1.4.0.rc2/src/buffer.c
michael@379	79	--- libmemcache-1.4.0.rc2/src/buffer.c.orig 2009-11-25 18:36:18.468286813 +0100
michael@379	80	+++ libmemcache-1.4.0.rc2/src/buffer.c 2009-11-25 18:36:20.700402681 +0100
michael@379	81	@@ -36,6 +36,7 @@
michael@379	82	#include <sys/uio.h>
michael@379	83	#include <unistd.h>
michael@379	84	#include <sys/errno.h>
michael@379	85	+#include <errno.h>
michael@379	86
michael@379	87	#include "memcache/buffer.h"
michael@379	88