diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-12-24 14:42:16 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-12-24 14:42:16 +0100 |
| commit | 0b7fb5abf3bfadac24b05afbf521d01daf42cec1 (patch) | |
| tree | bf899376d8750ba03fbd5ae88ac434fa17f5806c /patches/libmemcache-1.4.0.rc2 | |
| parent | 075aba255a4cc824576fd9f32be3e6d2f850521d (diff) | |
| download | ptxdist-0b7fb5abf3bfadac24b05afbf521d01daf42cec1.tar.gz ptxdist-0b7fb5abf3bfadac24b05afbf521d01daf42cec1.tar.xz | |
[libmemcache] add PPC patch from debian
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/libmemcache-1.4.0.rc2')
| -rw-r--r-- | patches/libmemcache-1.4.0.rc2/0004-Fix-PowerPC-issues-with-undefined-__USE_POSIX.patch | 55 | ||||
| -rw-r--r-- | patches/libmemcache-1.4.0.rc2/series | 3 |
2 files changed, 57 insertions, 1 deletions
diff --git a/patches/libmemcache-1.4.0.rc2/0004-Fix-PowerPC-issues-with-undefined-__USE_POSIX.patch b/patches/libmemcache-1.4.0.rc2/0004-Fix-PowerPC-issues-with-undefined-__USE_POSIX.patch new file mode 100644 index 000000000..1310f7d2d --- /dev/null +++ b/patches/libmemcache-1.4.0.rc2/0004-Fix-PowerPC-issues-with-undefined-__USE_POSIX.patch @@ -0,0 +1,55 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 24 Dec 2010 14:41:03 +0100 +Subject: [PATCH] Fix PowerPC issues with undefined __USE_POSIX + +Patch borrowed from Debian. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + include/memcache.h.in | 5 +++++ + src/memcache.c | 9 +++++++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/include/memcache.h.in b/include/memcache.h.in +index 2552b30..2b07a3d 100644 +--- a/include/memcache.h.in ++++ b/include/memcache.h.in +@@ -61,6 +61,11 @@ + #ifndef MEMCACHE_H + #define MEMCACHE_H + ++/* fix FTBFS on powerpc for Debian libmemcache */ ++#ifndef __USE_POSIX ++#define __USE_POSIX ++#endif ++ + #include <netdb.h> + #include <sys/types.h> + #include <sys/time.h> +diff --git a/src/memcache.c b/src/memcache.c +index 227758d..79b9d37 100644 +--- a/src/memcache.c ++++ b/src/memcache.c +@@ -39,12 +39,17 @@ + #include <sysexits.h> + #include <errno.h> + #include <sys/types.h> +-#ifdef __linux ++ ++/* fix FTBFS on powerpc for Debian libmemcache. I personally think this ++ * shouldnt be the case, as Debian Bug#345587 seems to show. */ ++ ++/* #ifdef __linux */ + # ifndef __USE_POSIX + # define __USE_POSIX + #warning "Working around busted-ass Linux header include problems: use FreeBSD instead" + #warning "http://www.FreeBSD.org/ - you won't regret it" +-# endif ++/* #endif */ ++ + #endif + #include <sys/time.h> + #include <sys/socket.h> +-- +1.7.2.3 + diff --git a/patches/libmemcache-1.4.0.rc2/series b/patches/libmemcache-1.4.0.rc2/series index 2fc52f07f..57603bb33 100644 --- a/patches/libmemcache-1.4.0.rc2/series +++ b/patches/libmemcache-1.4.0.rc2/series @@ -2,4 +2,5 @@ 0001-autotools-update.patch 0002-use-cached-for-setsockopt-in-configure.ac.patch 0003-Add-required-files.patch -# 4539bca0efe63807a2c59cd56d1c9245 - git-ptx-patches magic +0004-Fix-PowerPC-issues-with-undefined-__USE_POSIX.patch +# 19495328f07d0088a3ba55810fa3bb31 - git-ptx-patches magic |