summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2009-09-10 17:50:59 -0700
committerKhem Raj <raj.khem@gmail.com>2009-09-10 17:56:47 -0700
commitfae7226fa006e8157fd802cd50f6643fa56060bb (patch)
treea1808d1a3495cc5becfaa212e7e703ac61df13c0
parentb76c22a5c61a06c64c0baefec048690cf0c88806 (diff)
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>
-rw-r--r--recipes/uclibc/uclibc-initial_0.9.28.bb16
-rw-r--r--recipes/uclibc/uclibc-initial_0.9.29.bb12
-rw-r--r--recipes/uclibc/uclibc-initial_0.9.30.1.bb17
-rw-r--r--recipes/uclibc/uclibc-initial_0.9.30.bb16
-rw-r--r--recipes/uclibc/uclibc-initial_git.bb13
-rw-r--r--recipes/uclibc/uclibc-initial_nptl.bb12
6 files changed, 40 insertions, 46 deletions
diff --git a/recipes/uclibc/uclibc-initial_0.9.28.bb b/recipes/uclibc/uclibc-initial_0.9.28.bb
index dbd90fc862..6e82dcd50a 100644
--- 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 98ef7b291a..964f319783 100644
--- 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 d0edf93693..5c803b99c6 100644
--- 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 98ef7b291a..7cd953605b 100644
--- 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 38b85ef36f..6c91762723 100644
--- 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 3da8417e52..cca3c1e688 100644
--- 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
}