From 610220a95f9ef78590acb1b8f18abc984464da96 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 25 Sep 2014 14:31:59 +0800 Subject: man/texinfo: conditionally add gzip/bzip2/xz to RDEPENDS Conditionally add 'xz/bz2/gzip' to info/man's RDEPENDS according to DOC_COMPRESS. [YOCTO #6750] [YOCTO #6751] Signed-off-by: Hongxu Jia Signed-off-by: Ross Burton --- meta/recipes-extended/man/man_1.6g.bb | 13 +++++++++++++ meta/recipes-extended/texinfo/texinfo_5.2.bb | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb index a66e01cb9a..03fffd6015 100644 --- a/meta/recipes-extended/man/man_1.6g.bb +++ b/meta/recipes-extended/man/man_1.6g.bb @@ -9,6 +9,19 @@ PR = "r1" DEPENDS = "groff less" +def compress_pkg(d): + if "compress_doc" in (d.getVar("INHERIT", True) or "").split(): + compress = d.getVar("DOC_COMPRESS", True) + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS_${PN} += "${@compress_pkg(d)}" + SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \ file://man-1.5k-confpath.patch;striplevel=0 \ file://man-1.5h1-make.patch \ diff --git a/meta/recipes-extended/texinfo/texinfo_5.2.bb b/meta/recipes-extended/texinfo/texinfo_5.2.bb index 7b5a11a874..cf9dcfd5de 100644 --- a/meta/recipes-extended/texinfo/texinfo_5.2.bb +++ b/meta/recipes-extended/texinfo/texinfo_5.2.bb @@ -9,6 +9,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" PROVIDES_append_class-native = " texinfo-replacement-native" +def compress_pkg(d): + if "compress_doc" in (d.getVar("INHERIT", True) or "").split(): + compress = d.getVar("DOC_COMPRESS", True) + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS_info += "${@compress_pkg(d)}" + DEPENDS = "zlib ncurses texinfo-replacement-native" DEPENDS_class-native = "zlib-native ncurses-native" -- cgit v1.2.3