uclibc: Use gcc-cross-initial as staging compiler
Do not build fake shared libraries during uclibc-initial phase Let uclibc depend on gcc-cross-initial instead of gcc-cross-intermediate thereby set stage to remove gcc-cross-intermediate Let uclibc depend on uclibc-initial so that boostrap sysroot gets populated properly (From OE-Core rev: b954c2d7cd978adc059d672425c197eaaf57e852) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9a33e7b9a8
commit
99e93790fe
|
@ -15,19 +15,15 @@ do_install() {
|
|||
# Install initial headers into the cross dir
|
||||
make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
|
||||
install_headers install_startfiles
|
||||
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
|
||||
-o lib/libc.so
|
||||
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
|
||||
-o lib/libm.so
|
||||
install -d ${D}${libdir}
|
||||
install -m 755 lib/lib[cm].so ${D}${libdir}
|
||||
# add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
|
||||
|
||||
# add links to linux-libc-headers: final uclibc build need this.
|
||||
for t in linux asm asm-generic; do
|
||||
if [ -d ${D}${includedir}/$t ]; then
|
||||
rm -rf ${D}${includedir}/$t
|
||||
fi
|
||||
ln -sf ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
|
||||
done
|
||||
|
||||
}
|
||||
do_compile() {
|
||||
:
|
||||
|
|
|
@ -15,19 +15,15 @@ do_install() {
|
|||
# Install initial headers into the cross dir
|
||||
make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
|
||||
install_headers install_startfiles
|
||||
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
|
||||
-o lib/libc.so
|
||||
${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
|
||||
-o lib/libm.so
|
||||
install -d ${D}${libdir}
|
||||
install -m 755 lib/lib[cm].so ${D}${libdir}
|
||||
# add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
|
||||
|
||||
# add links to linux-libc-headers: final uclibc build need this.
|
||||
for t in linux asm asm-generic; do
|
||||
if [ -d ${D}${includedir}/$t ]; then
|
||||
rm -rf ${D}${includedir}/$t
|
||||
fi
|
||||
ln -sf ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
|
||||
done
|
||||
|
||||
}
|
||||
do_compile() {
|
||||
:
|
||||
|
|
|
@ -4,11 +4,12 @@ require uclibc.inc
|
|||
require uclibc-package.inc
|
||||
require uclibc-${PV}.inc
|
||||
|
||||
STAGINGCC = "gcc-cross-intermediate"
|
||||
STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
|
||||
STAGINGCC = "gcc-cross-initial"
|
||||
STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils \
|
||||
virtual/${TARGET_PREFIX}gcc-intermediate \
|
||||
virtual/${TARGET_PREFIX}gcc-initial \
|
||||
virtual/${TARGET_PREFIX}libc-initial \
|
||||
linux-libc-headers ncurses-native"
|
||||
|
||||
PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
|
||||
|
|
|
@ -4,13 +4,14 @@ require uclibc.inc
|
|||
require uclibc-package.inc
|
||||
require uclibc-git.inc
|
||||
|
||||
STAGINGCC = "gcc-cross-intermediate"
|
||||
STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
|
||||
STAGINGCC = "gcc-cross-initial"
|
||||
STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
|
||||
|
||||
PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils \
|
||||
virtual/${TARGET_PREFIX}gcc-intermediate \
|
||||
virtual/${TARGET_PREFIX}gcc-initial \
|
||||
virtual/${TARGET_PREFIX}libc-initial \
|
||||
linux-libc-headers ncurses-native"
|
||||
|
||||
RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
|
||||
|
|
Loading…
Reference in New Issue