[oe-commits] unknown gcc-package-cross: fix for avr32-gcc and cross-linkage changes

[koen commit]

gcc-package-cross: fix for avr32-gcc and cross-linkage changes

Author: koen at openembedded.org
Branch: unknown
Revision: 30776ae99d8431326bcd7a7232aa3b7adf7a82c7
ViewMTN: http://monotone.openembedded.org/revision/info/30776ae99d8431326bcd7a7232aa3b7adf7a82c7
Files:
1
packages/gcc/gcc-package-cross.inc
Diffs:

#
# mt diff -ra07e017f41e98f419866c510b4587531d8f018b1 -r30776ae99d8431326bcd7a7232aa3b7adf7a82c7
#
# 
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [901b20bf5ed153e03af3a2c855363ed1fe78017d]
#    to [0402798fc0b370009fc890a7184e8e7ca7ebdabc]
# 
============================================================
--- packages/gcc/gcc-package-cross.inc	901b20bf5ed153e03af3a2c855363ed1fe78017d
+++ packages/gcc/gcc-package-cross.inc	0402798fc0b370009fc890a7184e8e7ca7ebdabc
@@ -44,14 +44,14 @@ do_install () {
 		# Already in the right location
 		:
 	elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir}
+		mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} || true
 	else
 		mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
 	mkdir -p ${D}${target_libdir}
-	mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir}
+	mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true 
 	mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
 	mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
 
@@ -60,7 +60,7 @@ do_install () {
        if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
                ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
                ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true
-               ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
+               ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* || true
                ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true
 	fi
 }