Skip to contentSkip to conversation

sane-toolchain.inc: FEED_ARCH should be prepended to OVERRIDES

PATCH In review Khem Raj 2 participants 3 messages Dec 22, 2010

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 sane-toolchain.inc: FEED_ARCH should be prepended to OVERRIDES

Currently it ends up after local override and hence appears first in FILESPATH and for buiding uclibc_git.bb on qemuarm it picks wrong uClibc.machine file from uclibc-git/armv5te where as it should have picked from uclibc-git/qemuarm

---
 conf/distro/include/sane-toolchain.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/sane-toolchain.inc +1 -1
index 6802eb2..f5ca22b 100644
@@ -75,7 +75,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 # Add FEED_ARCH to the overrides list so that we can override the
 # ARM_INSTRUCTION_SET like below
 
-OVERRIDES .= ":${FEED_ARCH}"
+OVERRIDES =. "${FEED_ARCH}:"
 
 # ARM920T and up can use thumb mode to decrease binary size at the expense of speed
 # (the complete story is a bit more nuanced due to cache starvation)
Signature · 1 line
1.7.0.4
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 14 lines · Khem Raj

Currently it ends up after local override and hence appears first in FILESPATH and for buiding uclibc_git.bb on qemuarm it picks wrong uClibc.machine file from uclibc-git/armv5te where as it should have picked from uclibc-git/qemuarm

---
 conf/distro/include/sane-toolchain.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/sane-toolchain.inc +0 -0
index 6802eb2..f5ca22b 100644

conf/distro/include/sane-toolchain.inc require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc · line 81

Quoted 8 lines
conf/distro/include/sane-toolchain.inc +1 -1
@@ -75,7 +75,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 # Add FEED_ARCH to the overrides list so that we can override the
 # ARM_INSTRUCTION_SET like below
 
-OVERRIDES .= ":${FEED_ARCH}"
+OVERRIDES =. "${FEED_ARCH}:"
 
 # ARM920T and up can use thumb mode to decrease binary size at the expense of speed
 # (the complete story is a bit more nuanced due to cache starvation)

Shouldn't that be BASE_PACKAGE_ARCH nowadays?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNEbe6MkyGM64RGpERAnMHAJ9x+kBJeouJPeVMJxQlgWNzTK05sACfSFur ckz3MaEHqpx3h9rPdo9pKn8=
=xnMX
-----END PGP SIGNATURE-----

author
#2 lore raw
Quoted 21 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 17 lines · Khem Raj

Currently it ends up after local override and hence appears first in FILESPATH and for buiding uclibc_git.bb on qemuarm it picks wrong uClibc.machine file from uclibc-git/armv5te where as it should have picked from uclibc-git/qemuarm

---
 conf/distro/include/sane-toolchain.inc |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/sane-toolchain.inc +0 -0
index 6802eb2..f5ca22b 100644
@@ -75,7 +75,7 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
  # Add FEED_ARCH to the overrides list so that we can override the
  # ARM_INSTRUCTION_SET like below
 
Quoted 7 lines

conf/distro/include/sane-toolchain.inc require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc · line 81

Quoted 5 lines
conf/distro/include/sane-toolchain.inc +1 -1
-OVERRIDES .= ":${FEED_ARCH}"
+OVERRIDES =. "${FEED_ARCH}:"
 
  # ARM920T and up can use thumb mode to decrease binary size at the expense of speed
  # (the complete story is a bit more nuanced due to cache starvation)

Shouldn't that be BASE_PACKAGE_ARCH nowadays?

logically yes. I think I will change it to BASE_PACKAGE_ARCH