summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-28 14:22:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 10:32:36 +0100
commit7f654dc5136b3b7fdfe6937e957478b418672062 (patch)
treec7a785378d42dc41e49d538e20eb2711c9a0d3f8
parenteb1c88c13f0490fa42fbe1681ac712ee883061a3 (diff)
downloadpoky-7f654dc5136b3b7fdfe6937e957478b418672062.tar.gz
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). (From OE-Core rev: 608ceb14ebc144102a0f9c2d449d9cb54b8f77b9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/classextend.py2
1 files changed, 2 insertions, 0 deletions
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):
110 110
111class NativesdkClassExtender(ClassExtender): 111class NativesdkClassExtender(ClassExtender):
112 def map_depends(self, dep): 112 def map_depends(self, dep):
113 if dep.startswith(self.extname):
114 return dep
113 if dep.endswith(("-gcc-initial", "-gcc", "-g++")): 115 if dep.endswith(("-gcc-initial", "-gcc", "-g++")):
114 return dep + "-crosssdk" 116 return dep + "-crosssdk"
115 elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): 117 elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep):