mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 10:54:57 +00:00
gcc: import yocto rev 0df3c481309e89b93e8a57773eb9c470b4dd13a7
From: Dexuan Cui <dexuan.cui@intel.com> Date: Sat, 15 Jan 2011 10:47:50 +0000 Subject: libgcc: use the new recipe (rather than gcc-runtime) to install libgcc_s.so* and crt*.o Currently gcc-runtime installs the files, but actually gcc-runtime's do_configure checks if the files are available, so before we build gcc-runtime, we should have some recipe install the files first! -- currently gcc-cross-intermediate actually does that(gcc-cross also installs the files, but it installs into the gcc-build-internal* directory), but gcc-cross-intermediate will have its own sysroot in future, after that, gcc-runtime won't build. So let us add this new target recipe and move the installation of the files from gcc-runtime into it changed to apply to gcc 4.5 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
parent
898fc9f4c9
commit
2414ce3108
@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
|
|||||||
|
|
||||||
SRCREV = "168622"
|
SRCREV = "168622"
|
||||||
PV = "4.5"
|
PV = "4.5"
|
||||||
INC_PR = "r30"
|
INC_PR = "r31"
|
||||||
|
|
||||||
# BINV should be incremented after updating to a revision
|
# BINV should be incremented after updating to a revision
|
||||||
# after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made
|
# after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made
|
||||||
|
|||||||
@ -31,28 +31,14 @@ do_compile () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
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}
|
|
||||||
|
|
||||||
for d in ${RUNTIMETARGET}; do
|
for d in ${RUNTIMETARGET}; do
|
||||||
cd ${B}/$d/
|
cd ${B}/$d/
|
||||||
oe_runmake 'DESTDIR=${D}' install
|
oe_runmake 'DESTDIR=${D}' install
|
||||||
done
|
done
|
||||||
|
|
||||||
# Move libgcc_s into /lib
|
|
||||||
mkdir -p ${D}${base_libdir}
|
|
||||||
if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
|
|
||||||
mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
|
|
||||||
else
|
|
||||||
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
INHIBIT_DEFAULT_DEPS = "1"
|
INHIBIT_DEFAULT_DEPS = "1"
|
||||||
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
|
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc"
|
||||||
PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
|
PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
|
||||||
|
|
||||||
BBCLASSEXTEND = "nativesdk"
|
BBCLASSEXTEND = "nativesdk"
|
||||||
|
|||||||
@ -1,6 +1,4 @@
|
|||||||
PACKAGES = "\
|
PACKAGES = "\
|
||||||
libgcc \
|
|
||||||
libgcc-dev \
|
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
libstdc++-precompile-dev \
|
libstdc++-precompile-dev \
|
||||||
libstdc++-dev \
|
libstdc++-dev \
|
||||||
@ -14,12 +12,6 @@ PACKAGES = "\
|
|||||||
libmudflap-dev \
|
libmudflap-dev \
|
||||||
"
|
"
|
||||||
|
|
||||||
FILES_libgcc = "${base_libdir}/libgcc*.so.*"
|
|
||||||
FILES_libgcc-dev = " \
|
|
||||||
${base_libdir}/libgcc*.so \
|
|
||||||
${libdir}/${TARGET_SYS}/${BINV}/crt* \
|
|
||||||
${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
|
|
||||||
|
|
||||||
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
FILES_libg2c = "${target_libdir}/libg2c.so.*"
|
||||||
FILES_libg2c-dev = "\
|
FILES_libg2c-dev = "\
|
||||||
${libdir}/libg2c.so \
|
${libdir}/libg2c.so \
|
||||||
|
|||||||
42
recipes-devtools/gcc/libgcc_4.5.bb
Normal file
42
recipes-devtools/gcc/libgcc_4.5.bb
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
require gcc-${PV}.inc
|
||||||
|
|
||||||
|
PR = "r0"
|
||||||
|
|
||||||
|
INHIBIT_DEFAULT_DEPS = "1"
|
||||||
|
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
|
||||||
|
|
||||||
|
PACKAGES = "\
|
||||||
|
${PN} \
|
||||||
|
${PN}-dev \
|
||||||
|
"
|
||||||
|
|
||||||
|
FILES_${PN} = "${base_libdir}/libgcc*.so.*"
|
||||||
|
FILES_${PN}-dev = " \
|
||||||
|
${base_libdir}/libgcc*.so \
|
||||||
|
${libdir}/${TARGET_SYS}/${BINV}/crt* \
|
||||||
|
${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
|
||||||
|
|
||||||
|
do_fetch[noexec] = "1"
|
||||||
|
do_unpack[noexec] = "1"
|
||||||
|
do_patch[noexec] = "1"
|
||||||
|
do_configure[noexec] = "1"
|
||||||
|
do_compile[noexec] = "1"
|
||||||
|
|
||||||
|
do_install () {
|
||||||
|
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}
|
||||||
|
|
||||||
|
# Move libgcc_s into /lib
|
||||||
|
mkdir -p ${D}${base_libdir}
|
||||||
|
if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
|
||||||
|
mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
|
||||||
|
else
|
||||||
|
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "nativesdk"
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user