]> code.ossystems Code Review - openembedded-core.git/commitdiff
lib/oe/classextend: Fix nativesdk double name mapping
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 28 Jul 2015 13:22:53 +0000 (14:22 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 29 Jul 2015 21:53:23 +0000 (22:53 +0100)
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>
meta/lib/oe/classextend.py

index 8da87b771af93135a6af91c20bb5adfacbac3e87..5107ecde26264ecee8750249c72e55e30a7b43ae 100644 (file)
@@ -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):