diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-28 14:22:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 10:32:36 +0100 |
commit | 7f654dc5136b3b7fdfe6937e957478b418672062 (patch) | |
tree | c7a785378d42dc41e49d538e20eb2711c9a0d3f8 /meta/lib/oe/classextend.py | |
parent | eb1c88c13f0490fa42fbe1681ac712ee883061a3 (diff) | |
download | openembedded-core-contrib-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>
Diffstat (limited to 'meta/lib/oe/classextend.py')
-rw-r--r-- | meta/lib/oe/classextend.py | 2 |
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): 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): |