diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-08-24 08:51:39 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-08-24 08:51:39 +0000 |
| commit | 87dd9b603c8730c41aa20102d25b386b6123b1e3 (patch) | |
| tree | 9529085af6547c1f71ed7df1cc583900b030f4f7 /packages/uclibc/uclibc.inc | |
| parent | cbea2f4a751b5ee8fb1343a05742f8b8765dec7a (diff) | |
| parent | 7e541bf1f5abaad0105328e57198a05f8c17f242 (diff) | |
propagate from branch 'org.openembedded.dev' (head 63851b92b9273aff39e9034738719537beaaad00)
to branch 'org.openembedded.dev.avr32' (head 73b3fea2362aba583bd68ba2381480ce68660133)
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 ca6613d315..c513be5090 100644 --- 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 } |