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:28:16 +0100
commit160087f754eabf5da90fb51997e19d2e585aac4a (patch)
treeb858ff9cea5fdca2f8118e083c3a3741f7cab843
parent0d8d5a2d44988d32a5c8b995202a12ac106ba93c (diff)
downloadopenembedded-core-contrib-160087f754eabf5da90fb51997e19d2e585aac4a.tar.gz
openembedded-core-contrib-160087f754eabf5da90fb51997e19d2e585aac4a.tar.bz2
openembedded-core-contrib-160087f754eabf5da90fb51997e19d2e585aac4a.zip
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. 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 @@
# This class is inherited by recipes whose upstream packages invoke the
-# texinfo utilities at build-time. This class currently does nothing.
+# texinfo utilities at build-time. Native and cross recipes are made to use the
+# dummy scripts provided by texinfo-dummy-native, for improved performance.
+# Target architecture recipes use the genuine Texinfo utilities. By default,
+# they use the Texinfo utilities on the host system. If you want to use the
+# Texinfo recipe shipped with yoco, you can remove texinfo-native from
+# ASSUME_PROVIDED and makeinfo from SANITY_REQUIRED_UTILITIES.
+
+TEXDEP = "texinfo-native"
+TEXDEP_class-native = "texinfo-dummy-native"
+TEXDEP_class-cross = "texinfo-dummy-native"
+DEPENDS_append = " ${TEXDEP}"
+PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
+PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
+
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 = "\
python-native-runtime \
tar-native \
virtual/libintl-native \
+ texinfo-native\
"
# gzip-native should be listed above?