From 279419af0eb979e0269723bedec9d85d7bc4feab Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Oct 2010 15:49:11 -0700 Subject: gcc-package-cross, gcc-package-target: Stage libgcc_s.so linker stub * This stub is not staged in /usr/lib which is a problem for many python recipes as it looks for libgcc in that directory and fail to find it. Signed-off-by: Khem Raj --- recipes/gcc/gcc-4.5.inc | 2 +- recipes/gcc/gcc-package-cross.inc | 1 + recipes/gcc/gcc-package-target.inc | 7 +------ 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'recipes/gcc') diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 14c281cadf..c9412e68d2 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r16" +INC_PR = "r17" SRCREV = "165931" PV = "4.5" diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc index 045c790406..85139a22ef 100644 --- a/recipes/gcc/gcc-package-cross.inc +++ b/recipes/gcc/gcc-package-cross.inc @@ -14,6 +14,7 @@ FILES_libssp = "${target_libdir}/libssp.so.*" FILES_libgfortran = "${target_libdir}/libgfortran.so.*" FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" +FILES_libgcc-dev = "${target_libdir}/libgcc_s.so" FILES_libstdc++ = "${target_libdir}/libstdc++.so.*" diff --git a/recipes/gcc/gcc-package-target.inc b/recipes/gcc/gcc-package-target.inc index 0676b53ffb..57203180d1 100644 --- a/recipes/gcc/gcc-package-target.inc +++ b/recipes/gcc/gcc-package-target.inc @@ -55,7 +55,7 @@ FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov" FILES_gcov-symlinks = "${bindir}/gcov" FILES_libgcc = "${base_libdir}/libgcc*.so.*" -FILES_libgcc-dev = "${base_libdir}/libgcc*.so" +FILES_libgcc-dev = "${libdir}/libgcc*.so" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "${target_libdir}/libg2c.so.*" @@ -127,11 +127,6 @@ do_install () { else mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir} || true fi - rm -f ${D}${libdir}/libgcc_s.so || true - ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \ - | tr -s / \ - | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \ - ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so # We don't need libtool libraries rm -f ${D}${libdir}/libg2c.la &>/dev/null || true -- cgit 1.2.3-korg