diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
| commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
| tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-devtools/binutils/binutils.inc | |
| parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
| download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz | |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils.inc')
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 7f084b5cc4..5ab2b92f14 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc | |||
| @@ -41,7 +41,7 @@ USE_ALTERNATIVES_FOR = " \ | |||
| 41 | gprof \ | 41 | gprof \ |
| 42 | ld \ | 42 | ld \ |
| 43 | ld.bfd \ | 43 | ld.bfd \ |
| 44 | ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld.gold dwp', '', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld.gold dwp', '', d)} \ |
| 45 | nm \ | 45 | nm \ |
| 46 | objcopy \ | 46 | objcopy \ |
| 47 | objdump \ | 47 | objdump \ |
| @@ -69,11 +69,11 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ | |||
| 69 | --disable-werror \ | 69 | --disable-werror \ |
| 70 | --enable-plugins \ | 70 | --enable-plugins \ |
| 71 | ${LDGOLD} \ | 71 | ${LDGOLD} \ |
| 72 | ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" | 72 | ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" |
| 73 | 73 | ||
| 74 | LDGOLD_class-native = "" | 74 | LDGOLD_class-native = "" |
| 75 | LDGOLD_class-crosssdk = "" | 75 | LDGOLD_class-crosssdk = "" |
| 76 | LDGOLD ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)}" | 76 | LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)}" |
| 77 | 77 | ||
| 78 | # This is necessary due to a bug in the binutils Makefiles | 78 | # This is necessary due to a bug in the binutils Makefiles |
| 79 | # EXTRA_OEMAKE = "configure-build-libiberty all" | 79 | # EXTRA_OEMAKE = "configure-build-libiberty all" |
