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.2.5.bb | |
| parent | 5961d49c627b234d37a4451966db5b18ff7b0921 (diff) | |
glibc: Factor staging function into a common .inc and remove hardcoded staging layout
Diffstat (limited to 'packages/glibc/glibc_2.2.5.bb')
| -rw-r--r-- | packages/glibc/glibc_2.2.5.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index fd79701e6b..7b5eca2432 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -158,10 +158,10 @@ 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' \ + rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR_HOST}' \ + 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ + '${STAGING_DIR_HOST}${layout_base_libdir}libc.so.6' \ '${STAGING_INCDIR}/bits/errno.h' \ '${STAGING_INCDIR}/bits/libc-lock.h' \ '${STAGING_INCDIR}/gnu/stubs.h' \ @@ -187,9 +187,9 @@ do_stage() { 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" + install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i" done - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so } require glibc-package.bbclass |