aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-11-01 09:04:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:21 +0000
commit26343dc11725c4c15b78b8d45ff7d2fb8d35ef6e (patch)
treee2786331e0ecb319f8cbf2f06caa267a108a7fa0
parent80e6fc678f3dcd774d9376cdf2a6afcba2cd0b09 (diff)
downloadopenembedded-core-contrib-26343dc11725c4c15b78b8d45ff7d2fb8d35ef6e.tar.gz
openembedded-core-contrib-26343dc11725c4c15b78b8d45ff7d2fb8d35ef6e.tar.bz2
openembedded-core-contrib-26343dc11725c4c15b78b8d45ff7d2fb8d35ef6e.zip
texinfo.bbclass: use dummy dep for libtool-cross
The class clearly intends build tools to depend upon the dummy texinfo, but it does so using the class-cross override for cross recipes, and libtool-cross doesn't inherit cross. Add a special case to cover this. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/texinfo.bbclass11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/texinfo.bbclass b/meta/classes/texinfo.bbclass
index 92efbccddf..6b0def0eac 100644
--- a/meta/classes/texinfo.bbclass
+++ b/meta/classes/texinfo.bbclass
@@ -1,10 +1,10 @@
# This class is inherited by recipes whose upstream packages invoke the
# 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,
+# 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.
+# Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and
+# makeinfo from SANITY_REQUIRED_UTILITIES.
TEXDEP = "texinfo-native"
TEXDEP_class-native = "texinfo-dummy-native"
@@ -13,3 +13,6 @@ DEPENDS_append = " ${TEXDEP}"
PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"
+# libtool-cross doesn't inherit cross
+TEXDEP_pn-libtool-cross = "texinfo-dummy-native"
+PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:"