diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-07 09:13:26 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-07 09:13:26 +0000 |
| commit | d6fd6d24ea9cef7d661bed9424f54a7719bea5dc (patch) | |
| tree | 53b4312019771dd2586fd4349cde67c12689b5e8 /packages/uclibc/uclibc.inc | |
| parent | 950f437e524e56366b8e811acb729fb20d7d23f7 (diff) | |
| parent | f2253ce9643943256c0cfe4f73c662a11c1792ca (diff) | |
propagate from branch 'org.openembedded.dev' (head 23aeaf6386edeac3312ef7bf65975595704646cb)
to branch 'org.openembedded.dev.avr32' (head 60ed8ee80ed7d3ce9fd1d319931577988ff07968)
Diffstat (limited to 'packages/uclibc/uclibc.inc')
| -rw-r--r-- | packages/uclibc/uclibc.inc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 7fb8e5cf28..e57ef174a9 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -141,7 +141,7 @@ do_configure() { echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config fi - oe_runmake oldconfig + yes '' | oe_runmake oldconfig } do_stage() { @@ -151,7 +151,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 @@ -189,8 +188,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 @@ -216,5 +221,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 } |