uclibc: massively improve avr32 support, courtesy Stelios Koroneos

[openembedded.git] / packages / uclibc / uclibc.inc

diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index ca6613d..c513be5 100644 (file)
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -134,7 +134,7 @@ do_configure() {
                echo "# CONFIG_ARM_EABI is not set"     >> ${S}/.config
        fi
 
-       oe_runmake oldconfig
+       yes '' | oe_runmake oldconfig
 }
 
 do_stage() {
@@ -144,7 +144,6 @@ do_stage() {
                RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
                install_dev install_runtime
 
-       oe_runmake utils
        oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
                RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
                install_utils
@@ -182,8 +181,14 @@ do_stage() {
 }
 
 do_install() {
+        # Install into the cross dir (this MUST be done first because we
+        # will install crt1.o in the install_dev stage and gcc needs it)
+        oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
+                RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+                install_dev install_runtime
+
        oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
-               install_dev install_runtime install_utils
+               install_dev install_runtime 
 
        # We don't really need this in ${includedir}
        rm -f ${D}${prefix}/include/.cvsignore
@@ -209,5 +214,9 @@ do_install() {
                mv ${D}/usr/bin/* ${D}${bindir}/
                rmdir ${D}/usr/bin
        fi
+
+        oe_runmake utils
+        oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+                install_utils
 }