aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-04-30 20:51:02 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-05-02 11:43:47 +0200
commita61c18324df231029419ab59196b23a6fb2b4743 (patch)
tree477d49a2e94ab9a1316e4fe435aceef4dc80dd5f
parent477fc2e392357cd49b6e92629e2369ea287b7e6e (diff)
downloadmeta-openembedded-a61c18324df231029419ab59196b23a6fb2b4743.tar.gz
meta-openembedded-a61c18324df231029419ab59196b23a6fb2b4743.tar.bz2
meta-openembedded-a61c18324df231029419ab59196b23a6fb2b4743.zip
gcc-4.5: Match with OE-Core on building procedure for libgcc and gcc-runtime
Signed-off-by: Khem Raj <raj.khem@gmail.com> Tested-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb47
1 files changed, 36 insertions, 11 deletions
diff --git a/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb b/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb
index 1579c8b96..ecef5e704 100644
--- a/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb
+++ b/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb
@@ -1,33 +1,46 @@
require recipes-devtools/gcc/gcc-${PV}.inc
-
INHIBIT_DEFAULT_DEPS = "1"
+
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
PACKAGES = "\
${PN} \
${PN}-dev \
+ ${PN}-dbg \
+ libgcov-dev \
"
FILES_${PN} = "${base_libdir}/libgcc*.so.*"
FILES_${PN}-dev = " \
${base_libdir}/libgcc*.so \
${libdir}/${TARGET_SYS}/${BINV}/crt* \
- ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
+FILES_libgcov-dev = " \
+ ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a"
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
+FILES_${PN}-dbg += "${base_libdir}/.debug/"
-do_install () {
+do_configure () {
target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##`
-
- # Install libgcc from our gcc-cross saved data
install -d ${D}${base_libdir} ${D}${libdir}
- cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${D}
+ cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B}
+ mkdir -p ${B}/${PN}
+ cd ${B}/${PN}
+ chmod a+x ${S}/${PN}/configure
+ ${S}/${PN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+}
+
+do_compile () {
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
+ cd ${B}/${PN}
+ oe_runmake MULTIBUILDTOP=${B}/$target/${PN}/
+}
+
+do_install () {
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
+ cd ${B}/${PN}
+ oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${PN}/ install
# Move libgcc_s into /lib
mkdir -p ${D}${base_libdir}
@@ -36,7 +49,19 @@ do_install () {
else
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
fi
+
+ # install the runtime in /usr/lib/ not in /usr/lib/gcc on target
+ # so that cross-gcc can find it in the sysroot
+
+ mv ${D}${libdir}/gcc/* ${D}${libdir}
+ rm -rf ${D}${libdir}/gcc/
}
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
+
BBCLASSEXTEND = "nativesdk"
+INSANE_SKIP_libgcc-dev = "staticdev"
+INSANE_SKIP_libgcov-dev = "staticdev"