libmemcache: add patch to remove broken 'inline'

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 69 insertions, 13 deletions

diff --git a/patches/libmemcache-1.4.0.rc2/0001-autotools-update.patch b/patches/libmemcache-1.4.0.rc2/0001-autotools-update.patch
index c2ad9b8da..cf7f69ca0 100644
--- a/patches/libmemcache-1.4.0.rc2/0001-autotools-update.patch
+++ b/patches/libmemcache-1.4.0.rc2/0001-autotools-update.patch
@@ -17432,6 +17432,3 @@ index 0cbaef0..d30ee36 100644
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
--- 
-1.7.2.3
-
diff --git a/patches/libmemcache-1.4.0.rc2/0002-use-cached-for-setsockopt-in-configure.ac.patch b/patches/libmemcache-1.4.0.rc2/0002-use-cached-for-setsockopt-in-configure.ac.patch
index e74202e6e..4f5fb1165 100644
--- a/patches/libmemcache-1.4.0.rc2/0002-use-cached-for-setsockopt-in-configure.ac.patch
+++ b/patches/libmemcache-1.4.0.rc2/0002-use-cached-for-setsockopt-in-configure.ac.patch
@@ -78,6 +78,3 @@ index a1c8bf1..827e124 100644
  ])
  
  dnl check for SO_RCVTIMEO and SO_SNDTIMEO
--- 
-1.7.2.3
-
diff --git a/patches/libmemcache-1.4.0.rc2/0003-Add-required-files.patch b/patches/libmemcache-1.4.0.rc2/0003-Add-required-files.patch
index 393a6444c..91584776c 100644
--- a/patches/libmemcache-1.4.0.rc2/0003-Add-required-files.patch
+++ b/patches/libmemcache-1.4.0.rc2/0003-Add-required-files.patch
@@ -36,6 +36,3 @@ index 0000000..709e88f
 +++ b/README
 @@ -0,0 +1 @@
 +This must be here.
--- 
-1.7.2.3
-
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
index 1310f7d2d..6915d2b98 100644
--- 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
@@ -50,6 +50,3 @@ index 227758d..79b9d37 100644
  #endif
  #include <sys/time.h>
  #include <sys/socket.h>
--- 
-1.7.2.3
-
diff --git a/patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch b/patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch
new file mode 100644
index 000000000..8d6e44f17
--- /dev/null
+++ b/patches/libmemcache-1.4.0.rc2/0005-remove-broken-inline.patch
@@ -0,0 +1,66 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 22 Dec 2011 10:30:24 +0100
+Subject: [PATCH] remove broken inline
+
+Without this we may get something like this:
+
+[...]/libmemcache.so: undefined reference to `mcm_buf_len'
+[...]/libmemcache.so: undefined reference to `mcm_buf_remain_off'
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ include/memcache/buffer.h |    6 +++---
+ src/buffer.c              |    6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/memcache/buffer.h b/include/memcache/buffer.h
+index 2205b23..d352377 100644
+--- a/include/memcache/buffer.h
++++ b/include/memcache/buffer.h
+@@ -63,14 +63,14 @@ struct memcache_buf	*mcm_buf_find_replace(struct memcache_ctxt *, struct memcach
+ struct memcache_buf	*mcm_buf_find_replace2(struct memcache_ctxt *, struct memcache_buf *,
+ 						    const char *, struct memcache_buf *);
+ int	 mcm_buf_free(struct memcache_ctxt *, struct memcache_buf **);
+-inline u_int32_t	 mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
++u_int32_t	 mcm_buf_len(const struct memcache_ctxt *, const struct memcache_buf *);
+ struct memcache_buf	*mcm_buf_new(struct memcache_ctxt *);
+ struct memcache_buf	*mcm_buf_new2(struct memcache_ctxt *, const char *, const u_int32_t);
+ struct memcache_buf	*mcm_buf_new3(struct memcache_ctxt *, const char *);
+ size_t	 mcm_buf_read(struct memcache_ctxt *, struct memcache_buf *, int);
+ int	 mcm_buf_realloc(struct memcache_ctxt *, struct memcache_buf *, const u_int32_t);
+-inline size_t	 mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
+-inline size_t	 mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
++size_t	 mcm_buf_remain(const struct memcache_ctxt *, const struct memcache_buf *);
++size_t	 mcm_buf_remain_off(const struct memcache_ctxt *, const struct memcache_buf *);
+ int	 mcm_buf_replace(struct memcache_ctxt *, struct memcache_buf *, const char *, const u_int32_t);
+ int	 mcm_buf_replace2(struct memcache_ctxt *, struct memcache_buf *, const char *);
+ int	 mcm_buf_replace_buf(struct memcache_ctxt *, struct memcache_buf *, struct memcache_buf *);
+diff --git a/src/buffer.c b/src/buffer.c
+index 616307f..3934a7d 100644
+--- a/src/buffer.c
++++ b/src/buffer.c
+@@ -259,7 +259,7 @@ mcm_buf_free(struct memcache_ctxt *ctxt, struct memcache_buf **buf) {
+ }
+ 
+ 
+-inline u_int32_t
++u_int32_t
+ mcm_buf_len(const struct memcache_ctxt *ctxt, const struct memcache_buf *s) {
+   return s->len;
+ }
+@@ -425,13 +425,13 @@ mcm_buf_realloc(struct memcache_ctxt *ctxt, struct memcache_buf *buf, const u_in
+ }
+ 
+ 
+-inline size_t
++size_t
+ mcm_buf_remain(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
+   return mcm_buf_size(ctxt, buf) - mcm_buf_len(ctxt, buf);
+ }
+ 
+ 
+-inline size_t
++size_t
+ mcm_buf_remain_off(const struct memcache_ctxt *ctxt, const struct memcache_buf *buf) {
+   return mcm_buf_len(ctxt, buf) - buf->off;
+ }
diff --git a/patches/libmemcache-1.4.0.rc2/series b/patches/libmemcache-1.4.0.rc2/series
index 57603bb33..2f039e743 100644
--- a/patches/libmemcache-1.4.0.rc2/series
+++ b/patches/libmemcache-1.4.0.rc2/series
@@ -1,6 +1,8 @@
 # generated by git-ptx-patches
+#tag:base --start-number 1
 0001-autotools-update.patch
 0002-use-cached-for-setsockopt-in-configure.ac.patch
 0003-Add-required-files.patch
 0004-Fix-PowerPC-issues-with-undefined-__USE_POSIX.patch
-# 19495328f07d0088a3ba55810fa3bb31  - git-ptx-patches magic
+0005-remove-broken-inline.patch
+# 682697d19a16b9efa9958ef3b7646e1f  - git-ptx-patches magic