diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-31 13:46:47 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-31 13:46:47 +0000 |
| commit | 44cbb9985f111ce87e6990061c89e2e061b6c6ea (patch) | |
| tree | f26c7f7df66d468547e5b5cc8ba8dc328c44f08d /packages/glibc/glibc_2.5.bb | |
| parent | 43b6ecbcb39354a32e0b8dd7c02ec8789be0ab9a (diff) | |
| parent | 821528ad116a72c2323d88d21e979614c78f1b41 (diff) | |
propagate from branch 'org.openembedded.dev' (head a6b798a43c05aef43ed650ab880f3edd386d0aa3)
to branch 'org.openembedded.dev.avr32' (head 77e1041de2eef682f183f3f5199826818cb9c5b1)
Diffstat (limited to 'packages/glibc/glibc_2.5.bb')
| -rw-r--r-- | packages/glibc/glibc_2.5.bb | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index e35e1ced43..2ffa6f6367 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -8,8 +8,8 @@ RPROVIDES_${PN}-dev = "libc6-dev" PR = "r7" # the -isystem in bitbake.conf screws up glibc do_stage -BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" -TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" @@ -154,28 +154,6 @@ do_compile () { ) } -do_stage() { - rm -f ${STAGING_LIBDIR}/libc.so.6 - oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ - 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ - '${STAGING_LIBDIR}/libc.so.6' \ - install-headers install-lib - - install -d ${STAGING_INCDIR}/gnu \ - ${STAGING_INCDIR}/bits \ - ${STAGING_INCDIR}/rpcsvc - install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ - install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ - install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h - for r in ${rpcsvc}; do - h=`echo $r|sed -e's,\.x$,.h,'` - install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ - done - for i in libc.a libc_pic.a libc_nonshared.a; do - install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i" - done - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so -} +require glibc-stage.inc require glibc-package.bbclass |