[oe-commits] org.oe.dev meta-toolchain.bb: remove hardcoded references

[koen commit]

meta-toolchain.bb: remove hardcoded references

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 6a679e7d9699bf875db6c34234bb77064571c450
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6a679e7d9699bf875db6c34234bb77064571c450
Files:
1
packages/meta/meta-toolchain.bb
Diffs:

#
# mt diff -re4fce64196dc2f5d7f860659cb48ace5aac4cd83 -r6a679e7d9699bf875db6c34234bb77064571c450
#
# 
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [62009b60509cef4f66d33585c99250620bed04cb]
#    to [376d920d59e96e523541a715c64f8c0b769e8eb7]
# 
============================================================
--- packages/meta/meta-toolchain.bb	62009b60509cef4f66d33585c99250620bed04cb
+++ packages/meta/meta-toolchain.bb	376d920d59e96e523541a715c64f8c0b769e8eb7
@@ -72,22 +72,22 @@ EOF
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
 	# remove unwanted housekeeping files
-	mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+	mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
 	rm -rf ${SDK_OUTPUT}${libdir}/ipkg
 
 	# remove unwanted executables
 	rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
 
 	# remove broken .la files
-	rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la
+	rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
 
 	# fix pkgconfig data files
-	cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+	cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
 	for f in *.pc ; do
-		sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+		sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
 	done
 	for f in *.pc ; do
-		sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+		sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
 	done
 
         mkdir -p ${SDK_DEPLOY}