mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

libgcc-4.5: Fix nativesdk build problem

Browse Source 
We need to use BPN instead of PN so we
access libgcc and not libgcc-nativesdk

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>
This commit is contained in:
Khem Raj
2012-04-30 20:51:04 +00:00
committed by Koen Kooi
parent 9daadb3f49
commit 23a111fe54
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb
+18 -14
View File
@@ -4,11 +4,14 @@ INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
PACKAGES = "\ PACKAGES = "\
${PN} \ ${PN} \
${PN}-dev \ ${PN}-dev \
${PN}-dbg \ ${PN}-dbg \
libgcov-dev \ libgcov${PKGSUFFIX}-dev \
" "
FILES_${PN} = "${base_libdir}/libgcc*.so.*" FILES_${PN} = "${base_libdir}/libgcc*.so.*"
@@ -16,31 +19,31 @@ FILES_${PN}-dev = " \
${base_libdir}/libgcc*.so \ ${base_libdir}/libgcc*.so \
${libdir}/${TARGET_SYS}/${BINV}/crt* \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \
${libdir}/${TARGET_SYS}/${BINV}/libgcc*" ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
FILES_libgcov-dev = " \ FILES_libgcov${PKGSUFFIX}-dev = " \
${libdir}/${TARGET_SYS}/${BINV}/libgcov.a" ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
"
FILES_${PN}-dbg += "${base_libdir}/.debug/" FILES_${PN}-dbg += "${base_libdir}/.debug/"
do_configure () { do_configure () {
target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##` target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##`
install -d ${D}${base_libdir} ${D}${libdir} install -d ${D}${base_libdir} ${D}${libdir}
cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B} cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B}
mkdir -p ${B}/${PN} mkdir -p ${B}/${BPN}
cd ${B}/${PN} cd ${B}/${BPN}
chmod a+x ${S}/${PN}/configure chmod a+x ${S}/${BPN}/configure
${S}/${PN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
} }
do_compile () { do_compile () {
target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
cd ${B}/${PN} cd ${B}/${BPN}
oe_runmake MULTIBUILDTOP=${B}/$target/${PN}/ oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/
} }
do_install () { do_install () {
target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
cd ${B}/${PN} cd ${B}/${BPN}
oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${PN}/ install oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install
# Move libgcc_s into /lib # Move libgcc_s into /lib
mkdir -p ${D}${base_libdir} mkdir -p ${D}${base_libdir}
@@ -63,5 +66,6 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
BBCLASSEXTEND = "nativesdk" BBCLASSEXTEND = "nativesdk"
INSANE_SKIP_libgcc-dev = "staticdev" INSANE_SKIP_${PN}-dev = "staticdev"
INSANE_SKIP_libgcov-dev = "staticdev" INSANE_SKIP_libgcov${PKGSUFFIX}-dev = "staticdev"