From ffba3bbe131beaed10ac393b949c90b5af07bdbf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Apr 2022 11:52:30 -0700 Subject: memcached: Upgrade to 1.6.15 Drop upstreamed patch Signed-off-by: Khem Raj --- ...x.c-Check-for-NDEBUG-before-using-total_w.patch | 48 -------------------- .../recipes-support/memcached/memcached_1.6.15.bb | 51 +++++++++++++++++++++ .../recipes-support/memcached/memcached_1.6.9.bb | 52 ---------------------- 3 files changed, 51 insertions(+), 100 deletions(-) delete mode 100644 meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch create mode 100644 meta-networking/recipes-support/memcached/memcached_1.6.15.bb delete mode 100644 meta-networking/recipes-support/memcached/memcached_1.6.9.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch b/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch deleted file mode 100644 index 2979552a34..0000000000 --- a/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d6294e9166e4875a0572349aabcc5e51acbd2e3c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Jun 2021 11:33:12 -0700 -Subject: [PATCH] stats_prefix.c: Check for NDEBUG before using total_written - variable - -When using NDEBUG assert macro is ineffective which is caught by latest -clang and reports that total_written is set but unused. Therefore check -for NDEBUG to make sure assert is used only when its effective - -Fixes -error: variable 'total_written' set but not used [-Werror,-Wunused-but-set-variable] - size_t size = 0, written = 0, total_written = 0; - ^ -Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/792] -Signed-off-by: Khem Raj ---- - stats_prefix.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/stats_prefix.c b/stats_prefix.c -index 62f0d04..d72e514 100644 ---- a/stats_prefix.c -+++ b/stats_prefix.c -@@ -127,8 +127,10 @@ char *stats_prefix_dump(int *length) { - PREFIX_STATS *pfs; - char *buf; - int i, pos; -- size_t size = 0, written = 0, total_written = 0; -- -+ size_t size = 0, written = 0; -+#ifndef NDEBUG -+ size_t total_written = 0; -+#endif - /* - * Figure out how big the buffer needs to be. This is the sum of the - * lengths of the prefixes themselves, plus the size of one copy of -@@ -154,8 +156,10 @@ char *stats_prefix_dump(int *length) { - pfs->prefix, pfs->num_gets, pfs->num_hits, - pfs->num_sets, pfs->num_deletes); - pos += written; -+#ifndef NDEBUG - total_written += written; - assert(total_written < size); -+#endif - } - } - diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.15.bb b/meta-networking/recipes-support/memcached/memcached_1.6.15.bb new file mode 100644 index 0000000000..b28bfe72b7 --- /dev/null +++ b/meta-networking/recipes-support/memcached/memcached_1.6.15.bb @@ -0,0 +1,51 @@ +SUMMARY = "A high-performance memory object caching system" +DESCRIPTION = "\ + memcached optimizes specific high-load serving applications that are designed \ + to take advantage of its versatile no-locking memory access system. Clients \ + are available in several different programming languages, to suit the needs \ + of the specific application. Traditionally this has been used in mod_perl \ + apps to avoid storing large chunks of data in Apache memory, and to share \ + this burden across several machines." +SECTION = "web" +HOMEPAGE = "http://memcached.org/" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" + +inherit autotools + +DEPENDS += "libevent" +RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ + perl-module-tie-hash bash \ + " + +SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ + file://memcached-add-hugetlbfs-check.patch \ + " +SRC_URI[sha256sum] = "8d7abe3d649378edbba16f42ef1d66ca3f2ac075f2eb97145ce164388e6ed515" + +# set the same COMPATIBLE_HOST as libhugetlbfs +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" + +python __anonymous () { + endianness = d.getVar('SITEINFO_ENDIANNESS') + if endianness == 'le': + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") + else: + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" + +inherit update-rc.d + +INITSCRIPT_NAME = "memcached" +INITSCRIPT_PARAMS = "defaults" + +do_install:append() { + install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached + mkdir -p ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts +} diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.9.bb b/meta-networking/recipes-support/memcached/memcached_1.6.9.bb deleted file mode 100644 index adf3c34e11..0000000000 --- a/meta-networking/recipes-support/memcached/memcached_1.6.9.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "A high-performance memory object caching system" -DESCRIPTION = "\ - memcached optimizes specific high-load serving applications that are designed \ - to take advantage of its versatile no-locking memory access system. Clients \ - are available in several different programming languages, to suit the needs \ - of the specific application. Traditionally this has been used in mod_perl \ - apps to avoid storing large chunks of data in Apache memory, and to share \ - this burden across several machines." -SECTION = "web" -HOMEPAGE = "http://memcached.org/" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" - -inherit autotools - -DEPENDS += "libevent" -RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ - perl-module-tie-hash bash \ - " - -SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ - file://memcached-add-hugetlbfs-check.patch \ - file://0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch \ - " -SRC_URI[sha256sum] = "d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1" - -# set the same COMPATIBLE_HOST as libhugetlbfs -COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" - -python __anonymous () { - endianness = d.getVar('SITEINFO_ENDIANNESS') - if endianness == 'le': - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") - else: - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" - -inherit update-rc.d - -INITSCRIPT_NAME = "memcached" -INITSCRIPT_PARAMS = "defaults" - -do_install:append() { - install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached - mkdir -p ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts -} -- cgit v1.2.3-54-g00ecf