From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 28 Jul 2015 13:22:53 +0000 (+0100)
Subject: lib/oe/classextend: Fix nativesdk double name mapping
X-Git-Tag: 2015-10~1069
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=608ceb14ebc144102a0f9c2d449d9cb54b8f77b9;p=openembedded-core.git

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 <richard.purdie@linuxfoundation.org>
---

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):