From ea220105609de30498f4ba72f5aeec180de4be2f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 24 Sep 2012 16:25:37 -0500 Subject: multilib: Add support for cross-canadian multilib packages Add support for the generation of cross-canadian packages. Each cross-canadian package has: PN = "pkg-cross-canadian-${TRANSLATED_TARGET_ARCH}" in order for that to be evaluated properly with multilibs enabled, it was necessary to detect both the presence of the cross-canadian packages and then update the vars using the OVERRIDE for the multilib. Additional checks were made to ensure that any dependency that sais "cross-canadian" did not get prefixed with the MLPREFIX. Also, make sure that even when building multilib cross-canadian packages, we only use the single SDK PACKAGE_ARCH, we don't want or need variants. (From OE-Core rev: 132a182e2f6c330aa645de42c1aeb386e43bddd3) Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/lib/oe/classextend.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 857a6c9..c982fb7 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py @@ -50,7 +50,7 @@ class ClassExtender(object): return newdata def map_depends(self, dep): - if dep.endswith(("-native", "-native-runtime")): + if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('cross-canadian' in dep): return dep else: return self.extend_name(dep) @@ -93,7 +93,7 @@ class ClassExtender(object): class NativesdkClassExtender(ClassExtender): def map_depends(self, dep): - if dep.endswith(("-native", "-native-runtime", "-cross")): + if dep.endswith(("-native", "-native-runtime", "-cross")) or ('nativesdk-' in dep): return dep elif dep.endswith(("-gcc-intermediate", "-gcc-initial", "-gcc", "-g++")): return dep + "-crosssdk" -- cgit v1.1