[oe-commits] org.oe.dev meta-toolchain: Add a note about the libgcc package problems and factor out a variable name (from poky)

[rpurdie commit]

meta-toolchain: Add a note about the libgcc package problems and factor out a variable name (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 4a3bea25418fc8856fcd0c660a1af6c1c6c43f9c
ViewMTN: http://monotone.openembedded.org/revision/info/4a3bea25418fc8856fcd0c660a1af6c1c6c43f9c
Files:
1
packages/meta/meta-toolchain.bb
Diffs:

#
# mt diff -r5f1edcec4260feeecf3c6e726fe015f3e1728140 -r4a3bea25418fc8856fcd0c660a1af6c1c6c43f9c
#
# 
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [5ede0ab68d89b645b8a529a7753ba969648d4bb0]
#    to [0a3c27ba17829c90275a244bb3f8b8fab016756c]
# 
============================================================
--- packages/meta/meta-toolchain.bb	5ede0ab68d89b645b8a529a7753ba969648d4bb0
+++ packages/meta/meta-toolchain.bb	0a3c27ba17829c90275a244bb3f8b8fab016756c
@@ -70,10 +70,11 @@ do_populate_sdk() {
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
 	for pkg in $target_pkgs ; do
 		for arch in $revipkgarchs; do
-			if [ -e ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ]; then
-				echo "Found ${DEPLOY_DIR_IPK}/$arch/${pkg}_$arch.ipk"
-				cp ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/
-				orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2`
+			pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
+			if [ -e $pkgnames ]; then
+				echo "Found $pkgnames"
+				cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
+				orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
 				pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
 				mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
 				cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
@@ -97,6 +98,8 @@ do_populate_sdk() {
 
 	# add missing link to libgcc_s.so.1
 	# libgcc-dev should be responsible for that, but it's not getting built
+	# RP: it gets smashed up depending on the order that gcc, gcc-cross and 
+	# gcc-cross-sdk get built :( (30/11/07)
 	ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
 
 	# remove unwanted executables