From 3f2acf6d7e8c99fae52a9aa793349e4a703f8a90 Mon Sep 17 00:00:00 2001 From: wangmy Date: Fri, 29 Apr 2022 16:08:05 +0800 Subject: jemalloc: upgrade 5.2.1 -> 5.3.0 0001-Makefile.in-make-sure-doc-generated-before-install.patch removed since it's included in 5.3.0 Changelog: https://github.com/jemalloc/jemalloc/releases/tag/5.3.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...in-make-sure-doc-generated-before-install.patch | 42 ----------------- .../recipes-devtools/jemalloc/jemalloc_5.2.1.bb | 52 ---------------------- .../recipes-devtools/jemalloc/jemalloc_5.3.0.bb | 51 +++++++++++++++++++++ 3 files changed, 51 insertions(+), 94 deletions(-) delete mode 100644 meta-oe/recipes-devtools/jemalloc/files/0001-Makefile.in-make-sure-doc-generated-before-install.patch delete mode 100644 meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb create mode 100644 meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb (limited to 'meta-oe/recipes-devtools') diff --git a/meta-oe/recipes-devtools/jemalloc/files/0001-Makefile.in-make-sure-doc-generated-before-install.patch b/meta-oe/recipes-devtools/jemalloc/files/0001-Makefile.in-make-sure-doc-generated-before-install.patch deleted file mode 100644 index 0a1fe6d76e..0000000000 --- a/meta-oe/recipes-devtools/jemalloc/files/0001-Makefile.in-make-sure-doc-generated-before-install.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1efb45330f5dbe475a092cda6982e6d7e135485a Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Tue, 10 Aug 2021 13:02:18 +0000 -Subject: [PATCH] Makefile.in: make sure doc generated before install - -There is a race between the doc generation and the doc installation, -so make the install depend on the build for doc to fix the error occurs -sometimes as below: - | TOPDIR/tmp-glibc/hosttools/install: cannot stat 'doc/jemalloc.3': No such file or directory - | make: *** [Makefile:513: install_doc_man] Error 1 - -Upstream-Status: Submitted [https://github.com/jemalloc/jemalloc/pull/2108] - -Signed-off-by: Mingli Yu ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7128b007..ab94f0c8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -501,14 +501,14 @@ install_lib: install_lib_static - endif - install_lib: install_lib_pc - --install_doc_html: -+install_doc_html: build_doc_html - $(INSTALL) -d $(DATADIR)/doc/jemalloc$(install_suffix) - @for d in $(DOCS_HTML); do \ - echo "$(INSTALL) -m 644 $$d $(DATADIR)/doc/jemalloc$(install_suffix)"; \ - $(INSTALL) -m 644 $$d $(DATADIR)/doc/jemalloc$(install_suffix); \ - done - --install_doc_man: -+install_doc_man: build_doc_man - $(INSTALL) -d $(MANDIR)/man3 - @for d in $(DOCS_MAN3); do \ - echo "$(INSTALL) -m 644 $$d $(MANDIR)/man3"; \ --- -2.29.2 - diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb deleted file mode 100644 index 8618c8c6a7..0000000000 --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2021 Mingli Yu -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "General-purpose scalable concurrent malloc implementation" - -DESCRIPTION = "jemalloc is a general purpose malloc(3) implementation that emphasizes \ -fragmentation avoidance and scalable concurrency support." - -HOMEPAGE = "https://github.com/jemalloc/jemalloc" -LICENSE = "BSD-2-Clause" - -SECTION = "libs" - -LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f" - -SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https \ - file://0001-Makefile.in-make-sure-doc-generated-before-install.patch \ - file://run-ptest \ -" - -# Workaround for https://github.com/llvm/llvm-project/issues/52765 -SRC_URI:append:libc-glibc:toolchain-clang = " file://0001-test-Disable-optimization-with-clang-for-aligned_all.patch " - -SRCREV = "ea6b3e973b477b8061e0076bb257dbd7f3faa756" - -S = "${WORKDIR}/git" - -inherit autotools ptest - -EXTRA_AUTORECONF += "--exclude=autoheader" - -EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" - -do_install:append() { - sed -i -e 's@${STAGING_DIR_HOST}@@g' \ - -e 's@${STAGING_DIR_NATIVE}@@g' \ - -e 's@${WORKDIR}@@g' ${D}${bindir}/jemalloc-config -} - -do_compile_ptest() { - oe_runmake tests -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - subdirs="test/unit test/integration test/stress " - for tooltest in ${subdirs} - do - cp -r ${B}/${tooltest} ${D}${PTEST_PATH}/tests - done - find ${D}${PTEST_PATH}/tests \( -name "*.d" -o -name "*.o" \) -exec rm -f {} \; -} diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb new file mode 100644 index 0000000000..950b64ee9b --- /dev/null +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb @@ -0,0 +1,51 @@ +# Copyright (C) 2021 Mingli Yu +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "General-purpose scalable concurrent malloc implementation" + +DESCRIPTION = "jemalloc is a general purpose malloc(3) implementation that emphasizes \ +fragmentation avoidance and scalable concurrency support." + +HOMEPAGE = "https://github.com/jemalloc/jemalloc" +LICENSE = "BSD-2-Clause" + +SECTION = "libs" + +LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f" + +SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https \ + file://run-ptest \ + " + +# Workaround for https://github.com/llvm/llvm-project/issues/52765 +SRC_URI:append:libc-glibc:toolchain-clang = " file://0001-test-Disable-optimization-with-clang-for-aligned_all.patch " + +SRCREV = "54eaed1d8b56b1aa528be3bdd1877e59c56fa90c" + +S = "${WORKDIR}/git" + +inherit autotools ptest + +EXTRA_AUTORECONF += "--exclude=autoheader" + +EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" + +do_install:append() { + sed -i -e 's@${STAGING_DIR_HOST}@@g' \ + -e 's@${STAGING_DIR_NATIVE}@@g' \ + -e 's@${WORKDIR}@@g' ${D}${bindir}/jemalloc-config +} + +do_compile_ptest() { + oe_runmake tests +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + subdirs="test/unit test/integration test/stress " + for tooltest in ${subdirs} + do + cp -r ${B}/${tooltest} ${D}${PTEST_PATH}/tests + done + find ${D}${PTEST_PATH}/tests \( -name "*.d" -o -name "*.o" \) -exec rm -f {} \; +} -- cgit v1.2.3-54-g00ecf