diff options
| -rw-r--r-- | glibc/glibc_2.3.2.oe | 4 | ||||
| -rw-r--r-- | uclibc/uclibc_0.9.26.oe | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe index 5991f54469..3b6ddf8b3a 100644 --- a/glibc/glibc_2.3.2.oe +++ b/glibc/glibc_2.3.2.oe @@ -96,7 +96,7 @@ EXTRA_OECONF = "--without-tls --without-__thread --enable-kernel=${OLDEST_KERNEL glibcbuild_do_unpack () { mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/" # kernel headers - cp -a "${FILESDIR}/autoconf.h" "${WORKDIR}/linux/include/linux/" + touch ${WORKDIR}/linux/include/linux/autoconf.h sed 's:\(^.*define.*__NR_waitpid.*$\):/*&*/:' < ${WORKDIR}/linux/include/asm-arm/unistd.h > ${WORKDIR}/linux/include/asm-arm/unistd.h.new mv ${WORKDIR}/linux/include/asm-arm/unistd.h.new ${WORKDIR}/linux/include/asm-arm/unistd.h case ${TARGET_ARCH} in @@ -195,7 +195,7 @@ do_stage() { ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc install -m 0644 ${S}/include/gnu/stubs.h ${CROSS_DIR}/${TARGET_SYS}/include/gnu/ install -m 0644 ${B}/bits/stdio_lim.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/ - install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/bits/syscall.h + install -m 0644 misc/syscall-list.h ${CROSS_DIR}/${TARGET_SYS}/include/bits/syscall.h for r in ${rpcsvc}; do h=`echo $r|sed -e's,\.x$,.h,'` install -m 0644 ${S}/sunrpc/rpcsvc/$h ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc/ diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe index f723f762f7..b8e308a293 100644 --- a/uclibc/uclibc_0.9.26.oe +++ b/uclibc/uclibc_0.9.26.oe @@ -57,13 +57,14 @@ python do_patch () { } do_stage() { - # Install into the staging dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + # Install into the cross dir (this MUST be done first because we + # will install crt1.o in the install_dev stage and gcc needs it) + make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ + RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ install_dev install_runtime install_utils # We don't really need this - rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore + rm -f ${UCLIBC_PREFIX}/include/.cvsignore # Fixup shared lib symlinks ( cd ${UCLIBC_STAGE_PREFIX}/lib @@ -72,13 +73,13 @@ do_stage() { done ) - # Install into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ + # Install into the staging dir + make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ install_dev install_runtime install_utils # We don't really need this - rm -f ${UCLIBC_PREFIX}/include/.cvsignore + rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore # Fixup shared lib symlinks ( cd ${UCLIBC_STAGE_PREFIX}/lib |