mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
libgcc-4.5: Fix nativesdk build problem
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:
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user