From 3c7bcc004e9362d97f745eff3cc15a1f0e44c05f Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 12 Aug 2009 00:24:22 -0400 Subject: 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 --- recipes/gcc/gcc-package-cross.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'recipes/gcc/gcc-package-cross.inc') 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 -- cgit v1.2.3