summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-09-25 14:31:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 12:12:45 +0100
commit0d90e61611a1f8cd3a5c51094a790d3dcb16870f (patch)
tree0067932a293252b5f64f831b8c89d841dd8ac9f7
parent597b0c0954288e4c9bdf3319a2c33f5b30428d9f (diff)
downloadpoky-0d90e61611a1f8cd3a5c51094a790d3dcb16870f.tar.gz
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] (From OE-Core rev: 610220a95f9ef78590acb1b8f18abc984464da96) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/man/man_1.6g.bb13
-rw-r--r--meta/recipes-extended/texinfo/texinfo_5.2.bb13
2 files changed, 26 insertions, 0 deletions
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"
9 9
10DEPENDS = "groff less" 10DEPENDS = "groff less"
11 11
12def compress_pkg(d):
13 if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
14 compress = d.getVar("DOC_COMPRESS", True)
15 if compress == "gz":
16 return "gzip"
17 elif compress == "bz2":
18 return "bzip2"
19 elif compress == "xz":
20 return "xz"
21 return ""
22
23RDEPENDS_${PN} += "${@compress_pkg(d)}"
24
12SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \ 25SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
13 file://man-1.5k-confpath.patch;striplevel=0 \ 26 file://man-1.5k-confpath.patch;striplevel=0 \
14 file://man-1.5h1-make.patch \ 27 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"
9 9
10PROVIDES_append_class-native = " texinfo-replacement-native" 10PROVIDES_append_class-native = " texinfo-replacement-native"
11 11
12def compress_pkg(d):
13 if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
14 compress = d.getVar("DOC_COMPRESS", True)
15 if compress == "gz":
16 return "gzip"
17 elif compress == "bz2":
18 return "bzip2"
19 elif compress == "xz":
20 return "xz"
21 return ""
22
23RDEPENDS_info += "${@compress_pkg(d)}"
24
12DEPENDS = "zlib ncurses texinfo-replacement-native" 25DEPENDS = "zlib ncurses texinfo-replacement-native"
13DEPENDS_class-native = "zlib-native ncurses-native" 26DEPENDS_class-native = "zlib-native ncurses-native"
14 27