diff options
| author | Michael Smith <msmith@cbnco.com> | 2009-08-12 00:24:22 -0400 |
|---|---|---|
| committer | Michael Smith <msmith@cbnco.com> | 2009-08-20 21:53:11 -0400 |
| commit | 3c7bcc004e9362d97f745eff3cc15a1f0e44c05f (patch) | |
| tree | e7615c1b211694efb559b34066bc1d2cab2e7332 /recipes/gcc/gcc-package-cross.inc | |
| parent | 08825f5f1065c6c17d2f8d594b61a9e276a5fd30 (diff) | |
gcc: fix libstdc/libgcc packaging on x86_64
do_install was looking under ${D}/some long cross path/*/lib;
needs to be lib64 on x86_64. On x86_64 base_libdir would be set to
/lib64, so we can go by that.
Bump INC_PR for recent gccs: 4.1.2, 4.2.[34], 4.3.[34], 4.4.1.
Signed-off-by: Michael Smith <msmith@cbnco.com>
Diffstat (limited to 'recipes/gcc/gcc-package-cross.inc')
| -rw-r--r-- | recipes/gcc/gcc-package-cross.inc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc index fa1f47f51a..6c4f9bb5ec 100644 --- a/recipes/gcc/gcc-package-cross.inc +++ b/recipes/gcc/gcc-package-cross.inc @@ -29,7 +29,9 @@ do_install () { 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} || true + # Look for .../${TARGET_SYS}/lib/libgcc_s* + # (or /lib64/, on x86_64) + mv -f ${D}${prefix}/*/${target_base_libdir}/libgcc_s.so* ${D}${target_base_libdir} || true fi @@ -45,10 +47,11 @@ do_install () { mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true else - 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 - mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true + # Look for .../${TARGET_SYS}/lib/lib* (or /lib64/ on x86_64) + mv -f ${D}${prefix}/*/${target_base_libdir}/libstdc++.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/${target_base_libdir}/libg2c.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/${target_base_libdir}/libgfortran*.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/${target_base_libdir}/libssp*.so* ${D}${target_libdir} || true fi |