| Submitter | Khem Raj |
|---|---|
| Date | April 30, 2012, 8:51 p.m. |
| Message ID | <1335819064-29468-3-git-send-email-raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/26679/ |
| State | Accepted |
| Commit | 23a111fe542bd8d5f2d12f9d9ae9890c31dddeed |
| Headers | show |
Comments
On Mon, Apr 30, 2012 at 01:51:04PM -0700, Khem Raj wrote: > 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> > --- > toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb | 32 +++++++++++-------- > 1 files changed, 18 insertions(+), 14 deletions(-) > > diff --git a/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb b/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb > index ecef5e7..3f63931 100644 > --- a/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb > +++ b/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb > @@ -4,11 +4,14 @@ INHIBIT_DEFAULT_DEPS = "1" > > DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" > > +PKGSUFFIX = "" > +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" > + > PACKAGES = "\ > ${PN} \ > ${PN}-dev \ > ${PN}-dbg \ > - libgcov-dev \ > + libgcov${PKGSUFFIX}-dev \ > " > > FILES_${PN} = "${base_libdir}/libgcc*.so.*" > @@ -16,31 +19,31 @@ FILES_${PN}-dev = " \ > ${base_libdir}/libgcc*.so \ > ${libdir}/${TARGET_SYS}/${BINV}/crt* \ > ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" > -FILES_libgcov-dev = " \ > - ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a" > - > +FILES_libgcov${PKGSUFFIX}-dev = " \ > + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ > + " > FILES_${PN}-dbg += "${base_libdir}/.debug/" > > do_configure () { > target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##` > install -d ${D}${base_libdir} ${D}${libdir} > 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} > + mkdir -p ${B}/${BPN} > + cd ${B}/${BPN} > + chmod a+x ${S}/${BPN}/configure > + ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} > } > > do_compile () { > target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` > - cd ${B}/${PN} > - oe_runmake MULTIBUILDTOP=${B}/$target/${PN}/ > + cd ${B}/${BPN} > + oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/ > } > > do_install () { > target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` > - cd ${B}/${PN} > - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${PN}/ install > + cd ${B}/${BPN} > + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install > > # Move libgcc_s into /lib > mkdir -p ${D}${base_libdir} > @@ -63,5 +66,6 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" > > BBCLASSEXTEND = "nativesdk" > > -INSANE_SKIP_libgcc-dev = "staticdev" > -INSANE_SKIP_libgcov-dev = "staticdev" > +INSANE_SKIP_${PN}-dev = "staticdev" > +INSANE_SKIP_libgcov${PKGSUFFIX}-dev = "staticdev" > + > -- > 1.7.5.4 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Patch
diff --git a/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb b/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb index ecef5e7..3f63931 100644 --- a/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb +++ b/toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb @@ -4,11 +4,14 @@ INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" +PKGSUFFIX = "" +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" + PACKAGES = "\ ${PN} \ ${PN}-dev \ ${PN}-dbg \ - libgcov-dev \ + libgcov${PKGSUFFIX}-dev \ " FILES_${PN} = "${base_libdir}/libgcc*.so.*" @@ -16,31 +19,31 @@ FILES_${PN}-dev = " \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/crt* \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" -FILES_libgcov-dev = " \ - ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a" - +FILES_libgcov${PKGSUFFIX}-dev = " \ + ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ + " FILES_${PN}-dbg += "${base_libdir}/.debug/" do_configure () { target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##` install -d ${D}${base_libdir} ${D}${libdir} 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} + mkdir -p ${B}/${BPN} + cd ${B}/${BPN} + chmod a+x ${S}/${BPN}/configure + ${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} } do_compile () { target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` - cd ${B}/${PN} - oe_runmake MULTIBUILDTOP=${B}/$target/${PN}/ + cd ${B}/${BPN} + oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/ } do_install () { target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` - cd ${B}/${PN} - oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${PN}/ install + cd ${B}/${BPN} + oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install # Move libgcc_s into /lib mkdir -p ${D}${base_libdir} @@ -63,5 +66,6 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" BBCLASSEXTEND = "nativesdk" -INSANE_SKIP_libgcc-dev = "staticdev" -INSANE_SKIP_libgcov-dev = "staticdev" +INSANE_SKIP_${PN}-dev = "staticdev" +INSANE_SKIP_libgcov${PKGSUFFIX}-dev = "staticdev" +
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> --- toolchain-layer/recipes-devtools/gcc/libgcc_4.5.bb | 32 +++++++++++-------- 1 files changed, 18 insertions(+), 14 deletions(-)