diff options
| -rw-r--r-- | meta-oe/recipes-devtools/jemalloc/files/0001-Makefile.in-make-sure-doc-generated-before-install.patch | 42 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb (renamed from meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb) | 5 |
2 files changed, 2 insertions, 45 deletions
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 @@ | |||
| 1 | From 1efb45330f5dbe475a092cda6982e6d7e135485a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Tue, 10 Aug 2021 13:02:18 +0000 | ||
| 4 | Subject: [PATCH] Makefile.in: make sure doc generated before install | ||
| 5 | |||
| 6 | There is a race between the doc generation and the doc installation, | ||
| 7 | so make the install depend on the build for doc to fix the error occurs | ||
| 8 | sometimes as below: | ||
| 9 | | TOPDIR/tmp-glibc/hosttools/install: cannot stat 'doc/jemalloc.3': No such file or directory | ||
| 10 | | make: *** [Makefile:513: install_doc_man] Error 1 | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/jemalloc/jemalloc/pull/2108] | ||
| 13 | |||
| 14 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 15 | --- | ||
| 16 | Makefile.in | 4 ++-- | ||
| 17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/Makefile.in b/Makefile.in | ||
| 20 | index 7128b007..ab94f0c8 100644 | ||
| 21 | --- a/Makefile.in | ||
| 22 | +++ b/Makefile.in | ||
| 23 | @@ -501,14 +501,14 @@ install_lib: install_lib_static | ||
| 24 | endif | ||
| 25 | install_lib: install_lib_pc | ||
| 26 | |||
| 27 | -install_doc_html: | ||
| 28 | +install_doc_html: build_doc_html | ||
| 29 | $(INSTALL) -d $(DATADIR)/doc/jemalloc$(install_suffix) | ||
| 30 | @for d in $(DOCS_HTML); do \ | ||
| 31 | echo "$(INSTALL) -m 644 $$d $(DATADIR)/doc/jemalloc$(install_suffix)"; \ | ||
| 32 | $(INSTALL) -m 644 $$d $(DATADIR)/doc/jemalloc$(install_suffix); \ | ||
| 33 | done | ||
| 34 | |||
| 35 | -install_doc_man: | ||
| 36 | +install_doc_man: build_doc_man | ||
| 37 | $(INSTALL) -d $(MANDIR)/man3 | ||
| 38 | @for d in $(DOCS_MAN3); do \ | ||
| 39 | echo "$(INSTALL) -m 644 $$d $(MANDIR)/man3"; \ | ||
| 40 | -- | ||
| 41 | 2.29.2 | ||
| 42 | |||
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.2.1.bb b/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" | |||
| 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f" | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f" |
| 15 | 15 | ||
| 16 | SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https \ | 16 | SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https \ |
| 17 | file://0001-Makefile.in-make-sure-doc-generated-before-install.patch \ | ||
| 18 | file://run-ptest \ | 17 | file://run-ptest \ |
| 19 | " | 18 | " |
| 20 | 19 | ||
| 21 | # Workaround for https://github.com/llvm/llvm-project/issues/52765 | 20 | # Workaround for https://github.com/llvm/llvm-project/issues/52765 |
| 22 | SRC_URI:append:libc-glibc:toolchain-clang = " file://0001-test-Disable-optimization-with-clang-for-aligned_all.patch " | 21 | SRC_URI:append:libc-glibc:toolchain-clang = " file://0001-test-Disable-optimization-with-clang-for-aligned_all.patch " |
| 23 | 22 | ||
| 24 | SRCREV = "ea6b3e973b477b8061e0076bb257dbd7f3faa756" | 23 | SRCREV = "54eaed1d8b56b1aa528be3bdd1877e59c56fa90c" |
| 25 | 24 | ||
| 26 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
| 27 | 26 | ||
