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

diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 1d80176..55d2cbd 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -5,7 +5,7 @@ inherit cross
 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++"

diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 3272876..629e87b 100644 (file)
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -5,7 +5,7 @@ inherit cross
 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++"

diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index fa1b124..0875d1a 100644 (file)
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -37,22 +37,38 @@ python do_package() {
 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}
+
+        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
+
 
-       # 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
 
        # Manually run the target stripper since we won't get it run by
        # the packaging.