[oe-commits] Martin Jansa : conf/machine: use .= instead of += in TUNE_CCARGS

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: dylan
Commit: 6a9873477faea55a8e8d59a431b8f3c928a2c871
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6a9873477faea55a8e8d59a431b8f3c928a2c871

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Wed Apr 24 15:42:12 2013 +0200

conf/machine: use .= instead of += in TUNE_CCARGS

* number of TUNE_CCARGS conditionals is important if we add
  extra space with each one in "else" branch

  I'm building for 2 MACHINEs one is cortexa9, second is cortexa8

  few months ago we added TUNE_CCARGS[vardepvalue] in bitbake.conf
  http://git.openembedded.org/openembedded-core/commit/?id=03f1e34ea3ce80931e9c3cd2ab22824f28a7233b

  which fixed some cases (like mentioned tune-xscale and tune-arm926ejs)
  where both had unused TUNE_CCARGS when common DEFAULTTUNE was used.

  with cortexa[89] it's different, because cortexa9 has one extra TUNE_CCARGS
  TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa9", "-mtune=cortex-a9", "", d)}"
  which adds extra *space* even when not used because of '+=' and as result:

  $ bitbake-diffsigs tmp-eglibc/sstate-diff/1366797730/*/armv7*/adapterbase/*do_configure*
  basehash changed from f986789fb8fb3579ed6a3492cc8a8d10 to c851b5f838d945ee13072e9ad6725dca
  Variable TUNE_CCARGS value changed from
  ' -march=armv7-a     -mthumb-interwork -mfloat-abi=softfp -mfpu=neon '
  to
  ' -march=armv7-a     -mthumb-interwork -mfloat-abi=softfp -mfpu=neon  '
  Hash for dependent task gcc-runtime_4.7.bb.do_populate_sysroot changed from bdeabf7a86958b9110b566344b7916de to 2be5618e6bc8c57ec9db5659bf217915
  Hash for dependent task eglibc_2.17.bb.do_populate_sysroot changed from b4f40fc62dde684acd0a574532a55360 to 97fcb426603d4a1c1099c0504d2ebf7d
  Hash for dependent task glib-2.0_2.34.3.bb.do_populate_sysroot changed from fd2f90b83098c34e88d649d70f6ea4f5 to ebd740bb94ea3eb0a914efda6fc82c4a

(From OE-Core master rev: b7430ff83760ac29079d20dc7c62f498a0a9d55d)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/machine/include/arm/arch-armv4.inc       |    2 +-
 meta/conf/machine/include/arm/arch-armv5.inc       |    2 +-
 meta/conf/machine/include/arm/arch-armv6.inc       |    2 +-
 meta/conf/machine/include/arm/arch-armv7a.inc      |    2 +-
 meta/conf/machine/include/arm/feature-arm-neon.inc |    2 +-
 .../conf/machine/include/arm/feature-arm-thumb.inc |    4 ++--
 meta/conf/machine/include/arm/feature-arm-vfp.inc  |    2 +-
 meta/conf/machine/include/ia32/arch-ia32.inc       |    6 +++---
 meta/conf/machine/include/mips/arch-mips.inc       |   10 +++++-----
 meta/conf/machine/include/powerpc/arch-powerpc.inc |    6 +++---
 .../machine/include/powerpc/arch-powerpc64.inc     |    2 +-
 meta/conf/machine/include/sh/arch-sh.inc           |    2 +-
 meta/conf/machine/include/tune-arm1136jf-s.inc     |    2 +-
 meta/conf/machine/include/tune-arm920t.inc         |    2 +-
 meta/conf/machine/include/tune-arm926ejs.inc       |    2 +-
 meta/conf/machine/include/tune-arm9tdmi.inc        |    2 +-
 meta/conf/machine/include/tune-c3.inc              |    2 +-
 meta/conf/machine/include/tune-core2.inc           |    2 +-
 meta/conf/machine/include/tune-cortexa15.inc       |    2 +-
 meta/conf/machine/include/tune-cortexa7.inc        |    2 +-
 meta/conf/machine/include/tune-cortexa8.inc        |    2 +-
 meta/conf/machine/include/tune-cortexa9.inc        |    2 +-
 meta/conf/machine/include/tune-cortexm1.inc        |    2 +-
 meta/conf/machine/include/tune-cortexm3.inc        |    4 ++--
 meta/conf/machine/include/tune-cortexr4.inc        |    4 ++--
 meta/conf/machine/include/tune-ep9312.inc          |    2 +-
 meta/conf/machine/include/tune-i586.inc            |    2 +-
 meta/conf/machine/include/tune-iwmmxt.inc          |    2 +-
 meta/conf/machine/include/tune-mips32.inc          |    2 +-
 meta/conf/machine/include/tune-ppc476.inc          |    2 +-
 meta/conf/machine/include/tune-ppc603e.inc         |    2 +-
 meta/conf/machine/include/tune-ppce300c2.inc       |    2 +-
 meta/conf/machine/include/tune-ppce300c3.inc       |    2 +-
 meta/conf/machine/include/tune-ppce500.inc         |    4 ++--
 meta/conf/machine/include/tune-ppce500mc.inc       |    2 +-
 meta/conf/machine/include/tune-ppce500v2.inc       |    4 ++--
 meta/conf/machine/include/tune-ppce5500.inc        |    2 +-
 meta/conf/machine/include/tune-ppce6500.inc        |    2 +-
 meta/conf/machine/include/tune-sh3.inc             |    2 +-
 meta/conf/machine/include/tune-sh4.inc             |    4 ++--
 meta/conf/machine/include/tune-strongarm1100.inc   |    2 +-
 meta/conf/machine/include/tune-xscale.inc          |    2 +-
 42 files changed, 56 insertions(+), 56 deletions(-)

Diff:   http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=6a9873477faea55a8e8d59a431b8f3c928a2c871