[oe-commits] org.oe.dev packages/gcc/gcc-package-cross.inc : Fix to handle /nof/ dirs generated by some ppc

[ifaistos commit]

packages/gcc/gcc-package-cross.inc : Fix to handle /nof/ dirs generated by some ppc 
architectures
packages/gcc/gcc-cross_4.1.1.bb : Bump PR
packages/gcc/gcc-cross_4.1.2.bb : Bump PR

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 182f45ef8edad3fda0d5870c07f61d5bb85c1b5e
ViewMTN: http://monotone.openembedded.org/revision/info/182f45ef8edad3fda0d5870c07f61d5bb85c1b5e
Files:
1
packages/gcc/gcc-cross_4.1.1.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-package-cross.inc
Diffs:

#
# mt diff -rcd0c585edaf0b596dad62d5b9fc47c3a490d5b77 -r182f45ef8edad3fda0d5870c07f61d5bb85c1b5e
#
# 
# 
# patch "packages/gcc/gcc-cross_4.1.1.bb"
#  from [42f801925adac4cc37150a1422d2e24dc926679c]
#    to [f4054ac5d72bab125a84f4297bd60e1aa96db48c]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [a97b09211d1289f0d2c70e6c7866141e1d332393]
#    to [1c8dfeb73751415490cee71ede76e79b3e84ddd3]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [f115236a51712a96d6f59cc160292498b3579766]
#    to [640456e897b706e40950cf6e057d2adc77b2f9d7]
# 
============================================================
--- packages/gcc/gcc-cross_4.1.1.bb	42f801925adac4cc37150a1422d2e24dc926679c
+++ packages/gcc/gcc-cross_4.1.1.bb	f4054ac5d72bab125a84f4297bd60e1aa96db48c
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r14"
+PR = "r15"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb	a97b09211d1289f0d2c70e6c7866141e1d332393
+++ packages/gcc/gcc-cross_4.1.2.bb	1c8dfeb73751415490cee71ede76e79b3e84ddd3
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r9"
+PR = "r10"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc-package-cross.inc	f115236a51712a96d6f59cc160292498b3579766
+++ packages/gcc/gcc-package-cross.inc	640456e897b706e40950cf6e057d2adc77b2f9d7
@@ -37,23 +37,39 @@ do_install () {
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
-	# Move libgcc_s into /lib
-	mkdir -p ${D}${target_base_libdir}
-	if [ -f ${D}${target_base_libdir}/libgcc_s.so.? ]; then
-		# 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}
-	else
-		mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir}
-	fi
+  # Move libgcc_s into /lib
+        mkdir -p ${D}${target_base_libdir}
+        if [ -f ${D}${target_base_libdir}/libgcc_s.so.? ]; then
+                # 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}
 
-	# 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/libg2c.so* ${D}${target_libdir} || true
-	mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
+        elif [  -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then
+                mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir}
+        else
+                mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir}
+        fi
 
+
+
+   # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
+        mkdir -p ${D}${target_libdir}
+
+        if [ -f ${D}${prefix}/*/lib/nof/libstdc++.so ]; then
+
+           mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir}
+           mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
+
+        else
+           mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir}
+           mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
+        fi
+
+
+
        # Manually run the target stripper since we won't get it run by
        # the packaging.
        if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then