From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 28 Nov 2006 15:10:54 +0000 (+0000)
Subject: bitbake.conf : introduce the OBJDUMP variable, by default set to
X-Git-Tag: Release-2010-05/1~9453^2~254^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b127550884048827753325400f10a2e9461a07b;p=openembedded.git

bitbake.conf : introduce the OBJDUMP variable, by default set to
${HOST_PREFIX}objdump
package.bbclass : make use of the OBJDUMP variable rather than
calling ${BUILD_PREFIX}objdump inside do_shlibs. As the original
usage was faulty and ended up calling host objdump which works
for some arm targets but not all.
---

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 4909fc61df..c53b3ee708 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -575,7 +575,7 @@ python package_do_shlibs() {
 				soname = None
 				path = os.path.join(root, file)
 				if os.access(path, os.X_OK) or lib_re.match(file):
-					cmd = (bb.data.getVar('BUILD_PREFIX', d, 1) or "") + "objdump -p " + path + " 2>/dev/null"
+					cmd = bb.data.getVar('OBJDUMP', d, 1) + " -p " + path + " 2>/dev/null"
 					fd = os.popen(cmd)
 					lines = fd.readlines()
 					fd.close()
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f49f26b7da..92c7cef2dd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -233,6 +233,7 @@ export AS = "${HOST_PREFIX}as"
 export RANLIB = "${HOST_PREFIX}ranlib"
 export STRIP = "${HOST_PREFIX}strip"
 export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
 
 export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
 export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"