From 3f2acf6d7e8c99fae52a9aa793349e4a703f8a90 Mon Sep 17 00:00:00 2001 From: wangmy Date: Fri, 29 Apr 2022 16:08:05 +0800 Subject: [PATCH] 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 --- ...ke-sure-doc-generated-before-install.patch | 42 ------------------- .../{jemalloc_5.2.1.bb => jemalloc_5.3.0.bb} | 5 +-- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-devtools/jemalloc/files/0001-Makefile.in-make-sure-doc-generated-before-install.patch rename meta-oe/recipes-devtools/jemalloc/{jemalloc_5.2.1.bb => jemalloc_5.3.0.bb} (91%) 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.3.0.bb similarity index 91% rename from meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb rename to meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb index 8618c8c6a7..950b64ee9b 100644 --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb @@ -14,14 +14,13 @@ 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" +SRCREV = "54eaed1d8b56b1aa528be3bdd1877e59c56fa90c" S = "${WORKDIR}/git"