mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-10 04:30:00 +00:00
libmemcached: Upgrade to 1.0.18
Fix with musl along Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
@@ -0,0 +1,38 @@
|
|||||||
|
From ed4422979b221c8613ca02eb5c57cb80009366d1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 18 Mar 2017 10:13:24 -0700
|
||||||
|
Subject: [PATCH 1/2] Fix comparison types
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
error: comparison between pointer and integer ('char *' and 'int')
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
clients/memflush.cc | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/clients/memflush.cc b/clients/memflush.cc
|
||||||
|
index 8bd0dbf..71545ea 100644
|
||||||
|
--- a/clients/memflush.cc
|
||||||
|
+++ b/clients/memflush.cc
|
||||||
|
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
options_parse(argc, argv);
|
||||||
|
|
||||||
|
- if (opt_servers == false)
|
||||||
|
+ if (opt_servers == NULL)
|
||||||
|
{
|
||||||
|
char *temp;
|
||||||
|
|
||||||
|
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
|
||||||
|
opt_servers= strdup(temp);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (opt_servers == false)
|
||||||
|
+ if (opt_servers == NULL)
|
||||||
|
{
|
||||||
|
std::cerr << "No Servers provided" << std::endl;
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
||||||
+28
@@ -0,0 +1,28 @@
|
|||||||
|
From fa0fe001a5373c1ef9ff2175555b14fc07399e1b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 18 Mar 2017 10:01:44 -0700
|
||||||
|
Subject: [PATCH] configure.ac: Do not configure build-aux
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
configure: error: cannot find install-sh, install.sh, or shtool
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
configure.ac | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 17b7351..0263112 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -17,7 +17,6 @@ AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
|
||||||
|
AC_PROG_CC([cc gcc clang])
|
||||||
|
AC_PROG_CXX([c++ g++ clang++])
|
||||||
|
|
||||||
|
-AC_CONFIG_AUX_DIR([build-aux])
|
||||||
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
From e95609e4ae40a794ed198924505fd22d7d86a124 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 18 Mar 2017 10:16:14 -0700
|
||||||
|
Subject: [PATCH 2/2] POSIX_SPAWN_USEVFORK is not linux specific but glibc
|
||||||
|
specific
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
cmdline.cc:206:12: error: use of undeclared identifier 'POSIX_SPAWN_USEVFORK'
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
libtest/cmdline.cc | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
|
||||||
|
index 29a22de..34f0a89 100644
|
||||||
|
--- a/libtest/cmdline.cc
|
||||||
|
+++ b/libtest/cmdline.cc
|
||||||
|
@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[])
|
||||||
|
|
||||||
|
fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0);
|
||||||
|
|
||||||
|
-#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__)
|
||||||
|
+#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__)
|
||||||
|
// Use USEVFORK on linux
|
||||||
|
flags |= POSIX_SPAWN_USEVFORK;
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
2.12.0
|
||||||
|
|
||||||
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60"
|
|||||||
SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz"
|
SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz"
|
||||||
|
|
||||||
TARGET_LDFLAGS += "-luuid"
|
TARGET_LDFLAGS += "-luuid"
|
||||||
|
TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE"
|
||||||
|
|
||||||
PACKAGECONFIG ??= ""
|
PACKAGECONFIG ??= ""
|
||||||
PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
|
PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl"
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
require libmemcached.inc
|
|
||||||
|
|
||||||
SRC_URI += "file://crosscompile.patch"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "616297a1aedefc52b3f6922eda5d559a"
|
|
||||||
SRC_URI[sha256sum] = "dd7e9560029835bddf761a5b4c2339d9e5c7374558659b6c11b2c95e7d3a4325"
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
require libmemcached.inc
|
||||||
|
|
||||||
|
SRC_URI += "\
|
||||||
|
file://crosscompile.patch \
|
||||||
|
file://0001-configure.ac-Do-not-configure-build-aux.patch \
|
||||||
|
file://0001-Fix-comparison-types.patch \
|
||||||
|
file://0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch \
|
||||||
|
"
|
||||||
|
SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819"
|
||||||
|
SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82"
|
||||||
Reference in New Issue
Block a user