summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Eliaser <max.eliaser@intel.com>2014-06-10 13:24:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 12:31:38 +0100
commitd58401cac56e6991361f785596efd21e140e3448 (patch)
tree8c3a5bbe93b4cba2576b98055b920b9751ccdaa7
parent0a4ba77f66aff34fe7781f209cea9a012ff9d8e5 (diff)
downloadpoky-d58401cac56e6991361f785596efd21e140e3448.tar.gz
texinfo.bbclass: native/cross uses dummy texinfo; target uses host's Texinfo.
To unpack that to more than a single line: -native and -cross recipes are made to use the dummy Texinfo utilities provided by texinfo-dummy-native if they invoke those utilities at build time. The target-architecture (cross-compiled) recipes still use the genuine Texinfo utilites. Right now, they still use the host system's Texinfo utilities, but could be made to use the texinfo-native recipe we already ship with some config file changes. (From OE-Core rev: 160087f754eabf5da90fb51997e19d2e585aac4a) Signed-off-by: Max Eliaser <max.eliaser@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/texinfo.bbclass15
-rw-r--r--meta/conf/bitbake.conf1
2 files changed, 15 insertions, 1 deletions
diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass
index 60cba0f81d..92efbccddf 100644
--- a/meta/classes/texinfo.bbclass
+++ b/meta/classes/texinfo.bbclass
@@ -1,2 +1,15 @@
1# This class is inherited by recipes whose upstream packages invoke the 1# This class is inherited by recipes whose upstream packages invoke the
2# texinfo utilities at build-time. This class currently does nothing. 2# texinfo utilities at build-time. Native and cross recipes are made to use the
3# dummy scripts provided by texinfo-dummy-native, for improved performance.
4# Target architecture recipes use the genuine Texinfo utilities. By default,
5# they use the Texinfo utilities on the host system. If you want to use the
6# Texinfo recipe shipped with yoco, you can remove texinfo-native from
7# ASSUME_PROVIDED and makeinfo from SANITY_REQUIRED_UTILITIES.
8
9TEXDEP = "texinfo-native"
10TEXDEP_class-native = "texinfo-dummy-native"
11TEXDEP_class-cross = "texinfo-dummy-native"
12DEPENDS_append = " ${TEXDEP}"
13PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
14PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
15
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1d70d3c9dd..cd6f94004e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -181,6 +181,7 @@ ASSUME_PROVIDED = "\
181 python-native-runtime \ 181 python-native-runtime \
182 tar-native \ 182 tar-native \
183 virtual/libintl-native \ 183 virtual/libintl-native \
184 texinfo-native\
184 " 185 "
185# gzip-native should be listed above? 186# gzip-native should be listed above?
186 187