diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc-initial_git.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc_0.9.33.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-core/uclibc/uclibc_git.bb | 7 |
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() { # 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() { : 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() { # 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() { : 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 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" 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 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" |