diff options
author | Christopher Larson <chris_larson@mentor.com> | 2016-11-01 09:04:41 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:35 +0000 |
commit | 46af847aed6457e3a7b7e0d1e2609a2cf39071b7 (patch) | |
tree | d06d5af5717068a2d8128f1726c650342129d592 /meta/classes | |
parent | 33ceab797943f1647b723b6f8835d155cb07e673 (diff) | |
download | poky-46af847aed6457e3a7b7e0d1e2609a2cf39071b7.tar.gz |
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.
(From OE-Core rev: 26343dc11725c4c15b78b8d45ff7d2fb8d35ef6e)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/texinfo.bbclass | 11 |
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 @@ | |||
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. Native and cross recipes are made to use the | 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. | 3 | # dummy scripts provided by texinfo-dummy-native, for improved performance. |
4 | # Target architecture recipes use the genuine Texinfo utilities. By default, | 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 | 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 | 6 | # Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and |
7 | # ASSUME_PROVIDED and makeinfo from SANITY_REQUIRED_UTILITIES. | 7 | # makeinfo from SANITY_REQUIRED_UTILITIES. |
8 | 8 | ||
9 | TEXDEP = "texinfo-native" | 9 | TEXDEP = "texinfo-native" |
10 | TEXDEP_class-native = "texinfo-dummy-native" | 10 | TEXDEP_class-native = "texinfo-dummy-native" |
@@ -13,3 +13,6 @@ DEPENDS_append = " ${TEXDEP}" | |||
13 | PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" | 13 | PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" |
14 | PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" | 14 | PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" |
15 | 15 | ||
16 | # libtool-cross doesn't inherit cross | ||
17 | TEXDEP_pn-libtool-cross = "texinfo-dummy-native" | ||
18 | PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" | ||