diff options
Diffstat (limited to 'meta/recipes-extended/man-db')
-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/files/man_db.conf-avoid-multilib-install-file-conflict.patch | 16 | ||||
-rw-r--r-- | meta/recipes-extended/man-db/man-db_2.12.1.bb (renamed from meta/recipes-extended/man-db/man-db_2.9.4.bb) | 23 |
3 files changed, 50 insertions, 27 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 new file mode 100644 index 0000000000..57ecd48b1f --- /dev/null +++ b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch @@ -0,0 +1,38 @@ +From e4125223631f0d555fc327da6d8705bcc8ee5ba5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 9 Feb 2022 17:30:16 -0800 +Subject: [PATCH] man: Move local variable declaration to function scope + +There is a clang bug [1] unearthed here, so help clang by re-arranging +code without changing the logic, until its fixed in clang + +[1] https://github.com/llvm/llvm-project/issues/53692 + +Upstream-Status: Inappropriate [Inappropriate: Clang bug] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/man.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/man.c b/src/man.c +index 195d35d..6870989 100644 +--- a/src/man.c ++++ b/src/man.c +@@ -379,7 +379,7 @@ static void init_html_pager (void) + static error_t parse_opt (int key, char *arg, struct argp_state *state) + { + static bool apropos, whatis; /* retain values between calls */ +- ++ char *s; + /* Please keep these keys in the same order as in options above. */ + switch (key) { + case 'C': +@@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) + case OPT_WARNINGS: + #ifdef NROFF_WARNINGS + { +- char *s = xstrdup ++ s = xstrdup + (arg ? arg : default_roff_warnings); + const char *warning; + diff --git a/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch b/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch deleted file mode 100644 index 03273d3b49..0000000000 --- a/meta/recipes-extended/man-db/files/man_db.conf-avoid-multilib-install-file-conflict.patch +++ /dev/null @@ -1,16 +0,0 @@ -The first line of man_db.conf will be replaced by package name. And it causes -multilib install file conflict. Remove the line to avoid the issue. - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -diff --git a/src/man_db.conf.in b/src/man_db.conf.in -index bc8bb7e..04cfb31 100644 ---- a/src/man_db.conf.in -+++ b/src/man_db.conf.in -@@ -1,4 +1,3 @@ --# @config_file_basename@ - # - # This file is used by the man-db package to configure the man and cat paths. - # It is also used to provide a manpath for those without one by examining diff --git a/meta/recipes-extended/man-db/man-db_2.9.4.bb b/meta/recipes-extended/man-db/man-db_2.12.1.bb index f97974abb8..5c6797c8f1 100644 --- a/meta/recipes-extended/man-db/man-db_2.9.4.bb +++ b/meta/recipes-extended/man-db/man-db_2.12.1.bb @@ -1,18 +1,17 @@ SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command" HOMEPAGE = "http://man-db.nongnu.org/" DESCRIPTION = "man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases." -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a" +LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later & GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://docs/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://docs/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + " SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ file://99_mandb \ - file://man_db.conf-avoid-multilib-install-file-conflict.patch" -SRC_URI[sha256sum] = "b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756" - -# remove at next version upgrade or when output changes -PR = "r1" -HASHEQUIV_HASH_VERSION .= ".2" + file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ + " +SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265" DEPENDS = "libpipeline gdbm groff-native base-passwd" RDEPENDS:${PN} += "base-passwd" @@ -38,7 +37,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles + install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles fi } @@ -52,7 +51,9 @@ FILES:${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so" RDEPENDS:${PN} += "groff" RRECOMMENDS:${PN} += "less" -RPROVIDES:${PN} += " man" +# iconv from glibc-utils can be used to transform encoding +RRECOMMENDS:${PN}:append:libc-glibc = " glibc-utils" +RPROVIDES:${PN} += "man" def compress_pkg(d): if bb.utils.contains("INHERIT", "compress_doc", True, False, d): |