diff options
author | hongxu <hongxu.jia@eng.windriver.com> | 2024-11-27 15:35:57 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-29 18:26:14 +0000 |
commit | 3fd568f186094a6df28625e710c9ed3c7b66274f (patch) | |
tree | 5c5a983e628496c497eb1ee265e0adc9d87c5072 | |
parent | b35dc1a99d49710a981e024b0215d021afdb6c0f (diff) | |
download | poky-3fd568f186094a6df28625e710c9ed3c7b66274f.tar.gz |
man-db: upgrade 2.12.1 -> 2.13.0
Due to meta-clang has upgraded clang to 19.1.2 release [1]
which contains clang fix [2], drop 0001-man-Move-local-variable-declaration-to-function-scop.patch
[1] https://github.com/kraj/meta-clang/commit/d3180c5e597f587c822192caba3ceced2452b861
[2] https://github.com/llvm/llvm-project/commit/8bd06d5b6584
(From OE-Core rev: 779218621fc5c3c0498c489510a93f50528fba41)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch | 38 | ||||
-rw-r--r-- | meta/recipes-extended/man-db/man-db_2.13.0.bb (renamed from meta/recipes-extended/man-db/man-db_2.12.1.bb) | 3 |
2 files changed, 1 insertions, 40 deletions
diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch deleted file mode 100644 index 57ecd48b1f..0000000000 --- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From e4125223631f0d555fc327da6d8705bcc8ee5ba5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 9 Feb 2022 17:30:16 -0800 | ||
4 | Subject: [PATCH] man: Move local variable declaration to function scope | ||
5 | |||
6 | There is a clang bug [1] unearthed here, so help clang by re-arranging | ||
7 | code without changing the logic, until its fixed in clang | ||
8 | |||
9 | [1] https://github.com/llvm/llvm-project/issues/53692 | ||
10 | |||
11 | Upstream-Status: Inappropriate [Inappropriate: Clang bug] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | src/man.c | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/src/man.c b/src/man.c | ||
18 | index 195d35d..6870989 100644 | ||
19 | --- a/src/man.c | ||
20 | +++ b/src/man.c | ||
21 | @@ -379,7 +379,7 @@ static void init_html_pager (void) | ||
22 | static error_t parse_opt (int key, char *arg, struct argp_state *state) | ||
23 | { | ||
24 | static bool apropos, whatis; /* retain values between calls */ | ||
25 | - | ||
26 | + char *s; | ||
27 | /* Please keep these keys in the same order as in options above. */ | ||
28 | switch (key) { | ||
29 | case 'C': | ||
30 | @@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) | ||
31 | case OPT_WARNINGS: | ||
32 | #ifdef NROFF_WARNINGS | ||
33 | { | ||
34 | - char *s = xstrdup | ||
35 | + s = xstrdup | ||
36 | (arg ? arg : default_roff_warnings); | ||
37 | const char *warning; | ||
38 | |||
diff --git a/meta/recipes-extended/man-db/man-db_2.12.1.bb b/meta/recipes-extended/man-db/man-db_2.13.0.bb index 5c6797c8f1..2fa18a8f24 100644 --- a/meta/recipes-extended/man-db/man-db_2.12.1.bb +++ b/meta/recipes-extended/man-db/man-db_2.13.0.bb | |||
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ | |||
9 | 9 | ||
10 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ | 10 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ |
11 | file://99_mandb \ | 11 | file://99_mandb \ |
12 | file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ | ||
13 | " | 12 | " |
14 | SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265" | 13 | SRC_URI[sha256sum] = "82f0739f4f61aab5eb937d234de3b014e777b5538a28cbd31433c45ae09aefb9" |
15 | 14 | ||
16 | DEPENDS = "libpipeline gdbm groff-native base-passwd" | 15 | DEPENDS = "libpipeline gdbm groff-native base-passwd" |
17 | RDEPENDS:${PN} += "base-passwd" | 16 | RDEPENDS:${PN} += "base-passwd" |