diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-03-08 20:31:31 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-03-08 20:31:31 +0000 |
| commit | 57fcb010f4e810216e3e6506957c28b8df61e59a (patch) | |
| tree | e1d3e3e2a42d119bfb867e352702141dbc5e8ed2 | |
| parent | 2e23ab4bc93b4d1e3260dba770399583387616f9 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into zelda.tuxnami.org:/home/kergoth/code/packages
2004/03/08 05:33:15-05:00 local!kergoth
BUGFIX for glibc: ensure the proc and arch symlinks make it into the cross and staging areas.
BKrev: 404cd8232qdFVU1FZCEPhwiVQ7LguA
| -rw-r--r-- | glibc/glibc_2.3.2.oe | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe index 69ca2438cd..ca237f7b6c 100644 --- a/glibc/glibc_2.3.2.oe +++ b/glibc/glibc_2.3.2.oe @@ -148,18 +148,18 @@ do_stage() { '${STAGING_LIBDIR}/libc-${PV}.so' '${STAGING_LIBDIR}/libc.so.6' \ install-headers install-lib - cp -a '${WORKDIR}/linux/include/linux' '${STAGING_DIR}/target/include/' - cp -a '${WORKDIR}/linux/include/asm' '${STAGING_DIR}/target/include/' - cp -a "${WORKDIR}/linux/include/`readlink ${WORKDIR}/linux/include/asm`" '${STAGING_DIR}/target/include/' - - install -d ${STAGING_DIR}/target/include/gnu \ - ${STAGING_DIR}/target/include/bits \ - ${STAGING_DIR}/target/include/rpcsvc - install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_DIR}/target/include/gnu/ - install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_DIR}/target/include/bits/ + install -d ${STAGING_INCDIR}/asm + cp -a ${WORKDIR}/linux/include/linux ${STAGING_INCDIR}/ + cp -a ${WORKDIR}/linux/include/asm/* ${STAGING_INCDIR}/asm/ + + 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/ for r in ${rpcsvc}; do h=`echo $r|sed -e's,\.x$,.h,'` - install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_DIR}/target/include/rpcsvc/ + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ done for i in libc.a libc_pic.a libc_nonshared.a; do install ${B}/$i ${STAGING_LIBDIR}/ @@ -173,9 +173,9 @@ do_stage() { '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \ install-headers install-lib - install -d ${CROSS_DIR}/${TARGET_SYS}/include - cp -a '${WORKDIR}/linux/include/linux' '${CROSS_DIR}/${TARGET_SYS}/include/' - cp -R -L '${WORKDIR}/linux/include/asm' '${CROSS_DIR}/${TARGET_SYS}/include/' + install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm + cp -a ${WORKDIR}/linux/include/linux ${CROSS_DIR}/${TARGET_SYS}/include/ + cp -R ${WORKDIR}/linux/include/asm/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/ install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \ ${CROSS_DIR}/${TARGET_SYS}/include/bits \ @@ -200,6 +200,4 @@ do_install() { h=`echo $r|sed -e's,\.x$,.h,'` install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/ done -# cp -a ${WORKDIR}/linux/include/linux ${D}/${includedir}/ -# cp -a ${WORKDIR}/linux/include/asm-${TARGET_ARCH}/* ${D}/${includedir}/asm/ } |