diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-09-04 12:07:11 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-04 12:07:11 +0000 |
| commit | 1c24210e3f0b3f6a5a5783ed597252d453e6bd64 (patch) | |
| tree | 92a51cdf31cca39b866e3f818a799fa4fd6b570e /packages/uclibc/uclibc.inc | |
| parent | adc0e34177df635be3bec485a184e5573f13383e (diff) | |
| parent | b144d7d083863cb10a7d9219ddcede338f6e839a (diff) | |
propagate from branch 'org.openembedded.dev' (head 3fed235384e32b1c9ba26c86ff39b2ffb928fbed)
to branch 'org.openembedded.dev.avr32' (head 50c56d6b5b2d15f6bc9c32b4f9907bc0d1c3564b)
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 } |