aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-10-30 15:49:11 -0700
committerKhem Raj <raj.khem@gmail.com>2010-10-30 15:51:13 -0700
commit279419af0eb979e0269723bedec9d85d7bc4feab (patch)
treebd84e491cf057ad0dbe4bfffbb347f27df4c74c5
parent7634d114f02fce0851ddb1d5dd5bc3e27f21fde1 (diff)
downloadopenembedded-279419af0eb979e0269723bedec9d85d7bc4feab.zip
openembedded-279419af0eb979e0269723bedec9d85d7bc4feab.tar.gz
openembedded-279419af0eb979e0269723bedec9d85d7bc4feab.tar.bz2
gcc-package-cross, gcc-package-target: Stage libgcc_s.so linker stub
* This stub is not staged in <sysroot>/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 <raj.khem@gmail.com>
-rw-r--r--recipes/gcc/gcc-4.5.inc2
-rw-r--r--recipes/gcc/gcc-package-cross.inc1
-rw-r--r--recipes/gcc/gcc-package-target.inc7
3 files changed, 3 insertions, 7 deletions
diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc
index 14c281c..c9412e6 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 045c790..85139a2 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 0676b53..5720318 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