diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-08-03 22:57:08 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-08-03 22:57:08 +0000 |
| commit | a90dae26321f16fe5600e796c211a6f920063dcd (patch) | |
| tree | d487ae884f5fd9a8252ff72477b547df58f7a067 /uclibc | |
| parent | c20cb42ec8d6bc8919308e039b45b12136685452 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/projects/packages
2004/08/03 12:40:42-05:00 handhelds.org!kergoth
uclibc builds: move make oldconfig into do_configure, and mangle uclibc's awareness of the target FPU based on the TARGET_FPU variable.
2004/08/03 11:46:57-05:00 handhelds.org!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/packages
2004/08/03 11:45:01-05:00 handhelds.org!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/packages
2004/08/03 10:59:37-05:00 handhelds.org!kergoth
kill off a few unncessary test results.
BKrev: 411018441HwpjOID_6gDO1gm35XWGA
Diffstat (limited to 'uclibc')
| -rw-r--r-- | uclibc/uclibc_0.9.26.oe | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe index d5fc3006a3..5338191501 100644 --- a/uclibc/uclibc_0.9.26.oe +++ b/uclibc/uclibc_0.9.26.oe @@ -84,19 +84,27 @@ uclibcbuild_do_patch() { perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' ${S}/.config cp ${DL_DIR}/${UCLIBC_LOCALE_FILE} extra/locale +} - make oldconfig +uclibcbuild_do_fpumangle() { + perl -i -p -e 's,^HAS_FPU=y,# HAS_FPU is not set,' ${S}/.config } python do_patch () { oe.build.exec_func('base_do_patch', d) oe.build.exec_func('uclibcbuild_do_patch', d) + if oe.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + oe.build.exec_func('uclibcbuild_do_fpumangle', d) +} + +do_configure() { + oe_runmake oldconfig } do_stage() { # 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) - make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ + oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ install_dev install_runtime install_utils @@ -114,7 +122,7 @@ do_stage() { rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h # Install into the staging dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ install_dev install_runtime install_utils @@ -133,7 +141,7 @@ do_stage() { } do_install() { - make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ + oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \ install_dev install_runtime install_utils # We don't really need this in /usr/include |