From 608ceb14ebc144102a0f9c2d449d9cb54b8f77b9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 Jul 2015 14:22:53 +0100 Subject: lib/oe/classextend: Fix nativesdk double name mapping Handle the case a name has already been extended in the nativesdk case (avoids double name extensions which can happen with nativesdk-gcc). Signed-off-by: Richard Purdie --- meta/lib/oe/classextend.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/lib/oe/classextend.py') diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 8da87b771a..5107ecde26 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py @@ -110,6 +110,8 @@ class ClassExtender(object): class NativesdkClassExtender(ClassExtender): def map_depends(self, dep): + if dep.startswith(self.extname): + return dep if dep.endswith(("-gcc-initial", "-gcc", "-g++")): return dep + "-crosssdk" elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): -- cgit 1.2.3-korg