[oe-commits] Leon Woestenberg : uclibc-initial-nios2: Rework against .dev

[git version control]

Module: openembedded.git
Branch: nios2
Commit: 043fbaf04860d1f2eeeb302789d052b479e587bb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=043fbaf04860d1f2eeeb302789d052b479e587bb

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Thu Nov 26 00:06:04 2009 +0100

uclibc-initial-nios2: Rework against .dev

Signed-off-by: Leon Woestenberg <leon at sidebranch.com>

---

 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb |   39 +++++++++++--------------
 1 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/recipes/uclibc/uclibc-initial_nios2-0.9.27.bb b/recipes/uclibc/uclibc-initial_nios2-0.9.27.bb
index f4bab53..83c69a8 100644
--- a/recipes/uclibc/uclibc-initial_nios2-0.9.27.bb
+++ b/recipes/uclibc/uclibc-initial_nios2-0.9.27.bb
@@ -3,35 +3,30 @@ require uclibc_${PV}.bb
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "linux-libc-headers  ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
-do_stage() {
+do_install() {
 	# Install initial headers into the cross dir
-	make -j1 PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-		pregen install_dev
-	make -j1 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
-
-	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+	make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		install_headers #pregen install_dev
+	#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 libc/sysdeps/linux/${TARGET_ARCH}/crt[0in].o ${UCLIBC_STAGE_PREFIX}/lib
-	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
-
-}
-
-do_install() {
-	:
+	rm -f ${D}${includedir}/bits/atomicity.h
+	install -d ${D}${libdir}/
+	install -m 644 lib/crt[1in].o ${D}${libdir}/
+	install -d ${D}${libdir}/
+	install -m 644 lib/libc.so ${D}${libdir}/
 }
 
 do_compile () {
-	:
+	make -j1 V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		lib/crt1.o lib/crti.o lib/crtn.o
+#               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
 }