diff mbox series

[v5,1/2] man-db: Add missing rdep for col utility

Message ID 20250320193605.1469436-1-raj.khem@gmail.com
State Accepted, archived
Commit bf5c8801b471fa13df9d55932375bfaedb623bd0
Headers show
Series [v5,1/2] man-db: Add missing rdep for col utility | expand

Commit Message

Khem Raj March 20, 2025, 7:36 p.m. UTC 
man utility calls col utility internally when formatting is asked for
therefore it expects col to be in rootfs otherwise silently errors with
retcode 3 meaning 'file not found' in this case its due to col not being
found, other distros eg. gets this via bsdextrautils dependency

Add it via packageconfig and explicitly remove it for musl targets

libssh2 ptest mansyntax.sh fails due to this error, which now works

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v5: Turn col into a packageconfig and drop zlib from deps

 meta/recipes-extended/man-db/man-db_2.13.0.bb | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/meta/recipes-extended/man-db/man-db_2.13.0.bb b/meta/recipes-extended/man-db/man-db_2.13.0.bb
index 2178239bb60..f28bd4a9265 100644
--- a/meta/recipes-extended/man-db/man-db_2.13.0.bb
+++ b/meta/recipes-extended/man-db/man-db_2.13.0.bb
@@ -25,7 +25,12 @@  inherit gettext pkgconfig autotools systemd
 EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}"
 EXTRA_AUTORECONF += "-I ${S}/gl/m4"
 
+PACKAGECONFIG ??= "col"
+# util-linux col is deprecated and only builds for glibc
+PACKAGECONFIG:remove:libc-musl = "col"
+
 PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2"
+PACKAGECONFIG[col] = "--with-col=col,--with-col=,,util-linux-col"
 PACKAGECONFIG[gzip] = "--with-gzip=gzip,ac_cv_prog_have_gzip='',gzip"
 PACKAGECONFIG[lzip] = "--with-lzip=lzip,ac_cv_prog_have_lzip='',lzip"
 PACKAGECONFIG[lzma] = "--with-lzma=lzma,ac_cv_prog_have_lzma='',xz"