diff options
| author | Stelios Koroneos <skoroneos@digital-opsis.com> | 2007-10-27 12:13:09 +0000 |
|---|---|---|
| committer | Stelios Koroneos <skoroneos@digital-opsis.com> | 2007-10-27 12:13:09 +0000 |
| commit | 592e10fdc5f5a98e419097697b142f9a5bd31769 (patch) | |
| tree | 5ba19213200b54544c48c07eaf2c62745f34bd74 /packages/gcc/gcc-package-cross.inc | |
| parent | dafd387fe5ead45b9e5429a4d0a90900987a2e73 (diff) | |
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
Diffstat (limited to 'packages/gcc/gcc-package-cross.inc')
| -rw-r--r-- | packages/gcc/gcc-package-cross.inc | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index fa1b1247f5..0875d1ab86 100644 --- 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. |