summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-08-15 23:21:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-21 12:15:32 +0100
commit99e93790fef4683ab4c8bf441a544c50e238f44a (patch)
tree1621e4754f628672ab881491308eb9eb6c97d3da /meta/recipes-core
parent9a33e7b9a81fd4e6c2bbe2eb832b55d1da998d6b (diff)
downloadpoky-99e93790fef4683ab4c8bf441a544c50e238f44a.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb10
-rw-r--r--meta/recipes-core/uclibc/uclibc-initial_git.bb10
-rw-r--r--meta/recipes-core/uclibc/uclibc_0.9.33.bb7
-rw-r--r--meta/recipes-core/uclibc/uclibc_git.bb7
4 files changed, 14 insertions, 20 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
index 51afab2766..211d530d70 100644
--- a/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
+++ b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
@@ -15,19 +15,15 @@ do_install() {
15 # Install initial headers into the cross dir 15 # Install initial headers into the cross dir
16 make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ 16 make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
17 install_headers install_startfiles 17 install_headers install_startfiles
18 ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ 18
19 -o lib/libc.so 19 # add links to linux-libc-headers: final uclibc build need this.
20 ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
21 -o lib/libm.so
22 install -d ${D}${libdir}
23 install -m 755 lib/lib[cm].so ${D}${libdir}
24 # add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
25 for t in linux asm asm-generic; do 20 for t in linux asm asm-generic; do
26 if [ -d ${D}${includedir}/$t ]; then 21 if [ -d ${D}${includedir}/$t ]; then
27 rm -rf ${D}${includedir}/$t 22 rm -rf ${D}${includedir}/$t
28 fi 23 fi
29 ln -sf ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/ 24 ln -sf ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
30 done 25 done
26
31} 27}
32do_compile() { 28do_compile() {
33 : 29 :
diff --git a/meta/recipes-core/uclibc/uclibc-initial_git.bb b/meta/recipes-core/uclibc/uclibc-initial_git.bb
index 2226d25372..6fd75299c5 100644
--- a/meta/recipes-core/uclibc/uclibc-initial_git.bb
+++ b/meta/recipes-core/uclibc/uclibc-initial_git.bb
@@ -15,19 +15,15 @@ do_install() {
15 # Install initial headers into the cross dir 15 # Install initial headers into the cross dir
16 make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ 16 make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
17 install_headers install_startfiles 17 install_headers install_startfiles
18 ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ 18
19 -o lib/libc.so 19 # add links to linux-libc-headers: final uclibc build need this.
20 ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
21 -o lib/libm.so
22 install -d ${D}${libdir}
23 install -m 755 lib/lib[cm].so ${D}${libdir}
24 # add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
25 for t in linux asm asm-generic; do 20 for t in linux asm asm-generic; do
26 if [ -d ${D}${includedir}/$t ]; then 21 if [ -d ${D}${includedir}/$t ]; then
27 rm -rf ${D}${includedir}/$t 22 rm -rf ${D}${includedir}/$t
28 fi 23 fi
29 ln -sf ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/ 24 ln -sf ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
30 done 25 done
26
31} 27}
32do_compile() { 28do_compile() {
33 : 29 :
diff --git a/meta/recipes-core/uclibc/uclibc_0.9.33.bb b/meta/recipes-core/uclibc/uclibc_0.9.33.bb
index c8638966bd..8deedd3708 100644
--- a/meta/recipes-core/uclibc/uclibc_0.9.33.bb
+++ b/meta/recipes-core/uclibc/uclibc_0.9.33.bb
@@ -4,11 +4,12 @@ require uclibc.inc
4require uclibc-package.inc 4require uclibc-package.inc
5require uclibc-${PV}.inc 5require uclibc-${PV}.inc
6 6
7STAGINGCC = "gcc-cross-intermediate" 7STAGINGCC = "gcc-cross-initial"
8STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" 8STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
9 9
10DEPENDS = "virtual/${TARGET_PREFIX}binutils \ 10DEPENDS = "virtual/${TARGET_PREFIX}binutils \
11 virtual/${TARGET_PREFIX}gcc-intermediate \ 11 virtual/${TARGET_PREFIX}gcc-initial \
12 virtual/${TARGET_PREFIX}libc-initial \
12 linux-libc-headers ncurses-native" 13 linux-libc-headers ncurses-native"
13 14
14PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" 15PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index 4e5b830b6f..2a609472d5 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -4,13 +4,14 @@ require uclibc.inc
4require uclibc-package.inc 4require uclibc-package.inc
5require uclibc-git.inc 5require uclibc-git.inc
6 6
7STAGINGCC = "gcc-cross-intermediate" 7STAGINGCC = "gcc-cross-initial"
8STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" 8STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
9 9
10PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" 10PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
11 11
12DEPENDS = "virtual/${TARGET_PREFIX}binutils \ 12DEPENDS = "virtual/${TARGET_PREFIX}binutils \
13 virtual/${TARGET_PREFIX}gcc-intermediate \ 13 virtual/${TARGET_PREFIX}gcc-initial \
14 virtual/${TARGET_PREFIX}libc-initial \
14 linux-libc-headers ncurses-native" 15 linux-libc-headers ncurses-native"
15 16
16RDEPENDS_${PN}-dev = "linux-libc-headers-dev" 17RDEPENDS_${PN}-dev = "linux-libc-headers-dev"