uclibc-initial: Move the compile stuff to do_compile

* Currently all work is done in do_stage. On Henning's
  suggestion I refactored it.
* For 0.9.30 onwards installing pregen and install_dev
  built almost whole uclibc. We only needed libc headers
  so replaced with install_headers

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/uclibc/uclibc-initial_0.9.28.bb b/recipes/uclibc/uclibc-initial_0.9.28.bb
index dbd90fc8620bb08d3237d835d4bcbca706f2d4df..6e82dcd50a780f0fc390b770efef4676bc384975 100644 (file)
--- a/recipes/uclibc/uclibc-initial_0.9.28.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.28.bb
@@ -10,11 +10,6 @@ do_stage() {
        make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                pregen install_dev
-       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \
-               libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
-               libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
 
        install -d ${CROSS_DIR}/${TARGET_SYS}   
        ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
@@ -22,8 +17,7 @@ do_stage() {
        # This conflicts with the c++ version of this header
        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
        install -m 644 libc/sysdeps/linux/${TARGET_ARCH}/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
-       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-               -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+       install -m 644 libc/libc.so ${UCLIBC_STAGE_PREFIX}/lib
 
 }
 
@@ -32,5 +26,11 @@ do_install() {
 }
 
 do_compile () {
-       :
+       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \
+               libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
+               libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o lib/libc.so
 }

diff --git a/recipes/uclibc/uclibc-initial_0.9.29.bb b/recipes/uclibc/uclibc-initial_0.9.29.bb
index 98ef7b291aa769957f0b7bca822584d4e563727a..964f319783f5d6a73022cfef3d3ec5a57045a4cf 100644 (file)
--- a/recipes/uclibc/uclibc-initial_0.9.29.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.29.bb
@@ -10,9 +10,6 @@ do_stage() {
        make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                pregen install_dev
-       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               lib/crt1.o lib/crti.o lib/crtn.o
 
        install -d ${CROSS_DIR}/${TARGET_SYS}   
        ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
@@ -20,8 +17,7 @@ do_stage() {
        # This conflicts with the c++ version of this header
        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
        install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
-       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-               -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+       install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib
 
 }
 
@@ -30,5 +26,9 @@ do_install() {
 }
 
 do_compile () {
-       :
+       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               lib/crt1.o lib/crti.o lib/crtn.o
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o lib/libc.so
 }

diff --git a/recipes/uclibc/uclibc-initial_0.9.30.1.bb b/recipes/uclibc/uclibc-initial_0.9.30.1.bb
index d0edf93693a8dbad8d8dc75ef3b284ef44e3a848..5c803b99c6b696217abb15ba1e27624a334f18b1 100644 (file)
--- a/recipes/uclibc/uclibc-initial_0.9.30.1.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.30.1.bb
@@ -9,20 +9,13 @@ do_stage() {
        # Install initial headers into the cross dir
        make V=1 CC="${CC}" PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               pregen install_dev
-       make V=1 CC="${CC}" PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               lib/crt1.o lib/crti.o lib/crtn.o
-
-       install -d ${CROSS_DIR}/${TARGET_SYS}   
+               install_headers
        ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
        # This conflicts with the c++ version of this header
        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
        install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
-       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-               -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
-
+       install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib
 }
 
 do_install() {
@@ -30,5 +23,9 @@ do_install() {
 }
 
 do_compile () {
-       :
+       make V=1 CC="${CC}" PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               lib/crt1.o lib/crti.o lib/crtn.o
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o lib/libc.so
 }

diff --git a/recipes/uclibc/uclibc-initial_0.9.30.bb b/recipes/uclibc/uclibc-initial_0.9.30.bb
index 98ef7b291aa769957f0b7bca822584d4e563727a..7cd953605bd496093526705011a29725446ddd9c 100644 (file)
--- a/recipes/uclibc/uclibc-initial_0.9.30.bb
+++ b/recipes/uclibc/uclibc-initial_0.9.30.bb
@@ -9,20 +9,14 @@ do_stage() {
        # Install initial headers into the cross dir
        make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               pregen install_dev
-       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               lib/crt1.o lib/crti.o lib/crtn.o
+               install-headers
 
-       install -d ${CROSS_DIR}/${TARGET_SYS}   
        ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
        # This conflicts with the c++ version of this header
        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
        install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
-       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-               -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
-
+       install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib
 }
 
 do_install() {
@@ -30,5 +24,9 @@ do_install() {
 }
 
 do_compile () {
-       :
+       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               lib/crt1.o lib/crti.o lib/crtn.o
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o lib/libc.so
 }

diff --git a/recipes/uclibc/uclibc-initial_git.bb b/recipes/uclibc/uclibc-initial_git.bb
index 38b85ef36f06773f6f032c915517d7953623a000..6c917627235d80fd8a3c0aa0b0765b911cf4ca4b 100644 (file)
--- a/recipes/uclibc/uclibc-initial_git.bb
+++ b/recipes/uclibc/uclibc-initial_git.bb
@@ -10,17 +10,12 @@ do_stage() {
        make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
                install_headers
-       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               lib/crt1.o lib/crti.o lib/crtn.o
-
        ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
        # This conflicts with the c++ version of this header
        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
        install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
-       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-               -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+       install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib
 }
 
 do_install() {
@@ -28,5 +23,9 @@ do_install() {
 }
 
 do_compile () {
-       :
+       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               lib/crt1.o lib/crti.o lib/crtn.o
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o lib/libc.so
 }

diff --git a/recipes/uclibc/uclibc-initial_nptl.bb b/recipes/uclibc/uclibc-initial_nptl.bb
index 3da8417e526005ecbf2055e3c6f3f48e36bb6ca9..cca3c1e688d93834dbb572e7fc9804440b979488 100644 (file)
--- a/recipes/uclibc/uclibc-initial_nptl.bb
+++ b/recipes/uclibc/uclibc-initial_nptl.bb
@@ -14,16 +14,12 @@ do_stage() {
        ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
        # This conflicts with the c++ version of this header
-       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-               lib/crt1.o lib/crti.o lib/crtn.o V=1
 
        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
 
        install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+       install -m 644 lib/libc.so ${UCLIBC_STAGE_PREFIX}/lib
 
-       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-               -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
 }
 
 do_install() {
@@ -31,5 +27,9 @@ do_install() {
 }
 
 do_compile () {
-       :
+       make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+               lib/crt1.o lib/crti.o lib/crtn.o V=1
+       ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+               -o lib/libc.so
 }