summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch32
-rw-r--r--meta-networking/recipes-support/memcached/memcached_1.6.41.bb10
2 files changed, 2 insertions, 40 deletions
diff --git a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
deleted file mode 100644
index 26281e73ef..0000000000
--- a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From dfa90817a08f206f7e2dbba44d913968ae7f7d94 Mon Sep 17 00:00:00 2001
2From: Chong Lu <Chong.Lu@windriver.com>
3Date: Tue, 19 Aug 2014 17:38:32 +0800
4Subject: [PATCH] memcached: add knob to detect whether hugetlbfs are checked
5
6Add knob to detect whether hugetlbfs are checked or not.
7
8Upstream-Status: Pending
9
10Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
11---
12 configure.ac | 6 +++++-
13 1 file changed, 5 insertions(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 6f2ef97..bd7dd96 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -559,8 +559,12 @@ if test "x$enable_static" = "xyes"; then
20 fi
21
22 dnl ----------------------------------------------------------------------------
23+AC_ARG_ENABLE(hugetlbfs,
24+ [AS_HELP_STRING([--enable-hugetlbfs],[Enable hugetlbfs])])
25
26-AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs)
27+if test "x$enable_hugetlbfs" = "xyes"; then
28+ AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs)
29+fi
30
31 AC_HEADER_STDBOOL
32 AH_BOTTOM([#if HAVE_STDBOOL_H
diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.41.bb b/meta-networking/recipes-support/memcached/memcached_1.6.41.bb
index 9d759069ba..e41ebdb171 100644
--- a/meta-networking/recipes-support/memcached/memcached_1.6.41.bb
+++ b/meta-networking/recipes-support/memcached/memcached_1.6.41.bb
@@ -19,17 +19,14 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \
19 perl-module-tie-hash bash \ 19 perl-module-tie-hash bash \
20 " 20 "
21 21
22SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ 22SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz"
23 file://memcached-add-hugetlbfs-check.patch \
24 "
25SRC_URI[sha256sum] = "e097073c156eeff9e12655b054f446d57374cfba5c132dcdbe7fac64e728286a" 23SRC_URI[sha256sum] = "e097073c156eeff9e12655b054f446d57374cfba5c132dcdbe7fac64e728286a"
26 24
27CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" 25CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly"
28 26
29UPSTREAM_CHECK_URI = "${HOMEPAGE}" 27UPSTREAM_CHECK_URI = "${HOMEPAGE}"
30 28
31# set the same COMPATIBLE_HOST as libhugetlbfs 29COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|riscv64|aarch64|arm).*-linux*"
32COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*"
33 30
34# assoc.c:83:9: error: variable 'depth' set but not used [-Werror,-Wunused-but-set-variable] 31# assoc.c:83:9: error: variable 'depth' set but not used [-Werror,-Wunused-but-set-variable]
35CFLAGS:append:toolchain-clang = " -Wno-error=unused-but-set-variable" 32CFLAGS:append:toolchain-clang = " -Wno-error=unused-but-set-variable"
@@ -42,9 +39,6 @@ python __anonymous () {
42 d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") 39 d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big")
43} 40}
44 41
45PACKAGECONFIG ??= ""
46PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs"
47
48inherit update-rc.d 42inherit update-rc.d
49 43
50INITSCRIPT_NAME = "memcached" 44INITSCRIPT_NAME = "memcached"