diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-08 11:07:58 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-08 11:07:58 +0000 |
| commit | 1f7343079a1b56e623aba7fdf63946f3dae979e3 (patch) | |
| tree | 062776d2316111ee5c72fa1b9de7deb01cdca153 /packages/glibc/glibc_2.5.bb | |
| parent | 47007ab845cf3ff4c9038412df673853e5bde900 (diff) | |
| parent | a44ab8fc112a3ded9e4bf4d379243b399e2505a9 (diff) | |
merge of '689e57bae9a2678694a0233e81f710e4878928f4'
and 'c2e1d9a66fe20e02ea4226aaff7de2ccde79ffba'
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 |