mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
This commit is contained in:
committed by
Richard Purdie
parent
2ce2c1e6f9
commit
0df3c48130
@@ -87,6 +87,8 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
|
|||||||
# Others:
|
# Others:
|
||||||
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
|
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
|
||||||
PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
|
PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
|
||||||
|
PREFERRED_PROVIDER_libgcc ?= "libgcc"
|
||||||
|
PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
|
||||||
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
|
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
|
||||||
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
|
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
|
||||||
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
|
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
|
||||||
|
|||||||
@@ -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 \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
PR = "r17"
|
PR = "r18"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-runtime.inc
|
require gcc-configure-runtime.inc
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
require gcc-${PV}.inc
|
require gcc-${PV}.inc
|
||||||
require gcc-configure-runtime.inc
|
require gcc-configure-runtime.inc
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|
||||||
Reference in New Issue
Block a user