diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-10-29 21:45:43 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-10-29 21:45:43 +0000 |
| commit | ed8871081478dbba49836da15ef070e5b359e763 (patch) | |
| tree | 234891d4a560eba1b2c372a52b27e677aa4db7f4 /packages/glibc/glibc_2.4.bb | |
| parent | 5961d49c627b234d37a4451966db5b18ff7b0921 (diff) | |
glibc: Factor staging function into a common .inc and remove hardcoded staging layout
Diffstat (limited to 'packages/glibc/glibc_2.4.bb')
| -rw-r--r-- | packages/glibc/glibc_2.4.bb | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 9217779ad0..67446cad7d 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -8,7 +8,7 @@ DEFAULT_PREFERENCE_arm = "-1" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" -TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" @@ -113,7 +113,6 @@ do_munge() { addtask munge before do_patch after do_unpack - do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now @@ -144,28 +143,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 |