Toolchain updates:

	* Consolodate libc kernel header bits into one place, making uclibc
	  build against the 2.6 ones while we're at it.
	* Kill off the -initial glibc and uclibc, since first pass gcc can be
	  built without it (thanks gb).

BKrev: 4110927a6L5iwvPl5iNtHBpvnsxmOA

1 files changed, 8 insertions, 54 deletions

diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index aa1bd8cd1b..2fb4fd071b 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -29,7 +29,7 @@ PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-d
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
-DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']}"
+DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
 INHIBIT_DEFAULT_DEPS = "1"
 
 libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
@@ -49,14 +49,9 @@ FILES_glibc-pcprofile = "/lib/libpcprofile.so"
 FILES_glibc-thread-db = "/lib/libthread_db*"
 FILES_localedef = "${bindir}/localedef"
 
-HEADERS_VERSION = "2.6.5.1"
-HEADERS_DIR = "${WORKDIR}/linux-libc-headers-${HEADERS_VERSION}"
-
-#	   file://noinfo.patch;patch=1 \
-#	   file://ldconfig.patch;patch=1;pnum=0 \
-
+#	   file://noinfo.patch;patch=1
+#	   file://ldconfig.patch;patch=1;pnum=0
 SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@oe.data.getVar('PV', d, 1)[9:]} \
-	   http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${HEADERS_VERSION}.tar.bz2 \
 	   file://arm-ioperm.patch;patch=1;pnum=0 \
 	   file://makeconfig.patch;patch=1;pnum=0 \
 	   file://ldd.patch;patch=1;pnum=0 \
@@ -78,7 +73,9 @@ inherit autotools
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 	        --without-cvs --disable-profile --disable-debug --without-gd \
 		--enable-clocale=gnu \
-	        --enable-add-ons=${GLIBC_ADDONS} --with-headers=${HEADERS_DIR}/include ${GLIBC_EXTRA_OECONF}"
+	        --enable-add-ons=${GLIBC_ADDONS} \
+		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+		${GLIBC_EXTRA_OECONF}"
 
 EXTRA_OECONF += "${@get_glibc_fpu_setting(oe, d)}"
 
@@ -87,39 +84,6 @@ def get_glibc_fpu_setting(oe, d):
 		return "--without-fp"
 	return ""
 
-glibcbuild_do_unpack () {
-# kernel headers
-	case ${TARGET_ARCH} in
-		alpha*)   TARGET_ARCH=alpha ;;
-		arm*)     TARGET_ARCH=arm ;;
-		cris*)    TARGET_ARCH=cris ;;
-		hppa*)    TARGET_ARCH=parisc ;;
-		i*86*)    TARGET_ARCH=i386 ;;
-		ia64*)    TARGET_ARCH=ia64 ;;
-		mips*)    TARGET_ARCH=mips ;;
-		m68k*)    TARGET_ARCH=m68k ;;
-		powerpc*) TARGET_ARCH=ppc ;;
-		s390*)    TARGET_ARCH=s390 ;;
-		sh*)      TARGET_ARCH=sh ;;
-		sparc64*) TARGET_ARCH=sparc64 ;;
-		sparc*)   TARGET_ARCH=sparc ;;
-		x86_64*)  TARGET_ARCH=x86_64 ;;
-	esac
-	if test !  -e ${HEADERS_DIR}/include/asm-$TARGET_ARCH; then
-		oefatal unable to create asm symlink in kernel headers
-	fi
-	ln -sf "asm-$TARGET_ARCH" "${HEADERS_DIR}/include/asm"
-	if test "$TARGET_ARCH" = "arm"; then
-		ln -sf proc-armv ${HEADERS_DIR}/include/asm/proc
-		ln -sf arch-ebsa285 ${HEADERS_DIR}/include/asm/arch
-	fi
-}
-
-python do_unpack () {
-	oe.build.exec_func('base_do_unpack', d)
-	oe.build.exec_func('glibcbuild_do_unpack', d)
-}
-
 do_configure () {
 # override this function to avoid the autoconf/automake/aclocal/autoheader
 # calls for now
@@ -155,12 +119,6 @@ do_stage() {
 		   '${STAGING_LIBDIR}/libc.so.6' \
 		   install-headers install-lib
 
-	install -d ${STAGING_INCDIR}/asm
-	rm -f ${STAGING_INCDIR}/linux/wireless.h
-	cp -a ${HEADERS_DIR}/include/linux ${STAGING_INCDIR}/
-	ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
-	cp -a ${HEADERS_DIR}/include/asm/* ${STAGING_INCDIR}/asm/
-
 	install -d ${STAGING_INCDIR}/gnu \
 		   ${STAGING_INCDIR}/bits \
 		   ${STAGING_INCDIR}/rpcsvc
@@ -172,7 +130,7 @@ 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 ${B}/$i ${STAGING_LIBDIR}/
+		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
@@ -183,10 +141,6 @@ do_stage() {
 		   '${CROSS_DIR}/${TARGET_SYS}/lib/libc.so.6' \
 		   install-headers install-lib
 
-	install -d ${CROSS_DIR}/${TARGET_SYS}/include/asm
-	cp -a ${HEADERS_DIR}/include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
-	cp -R ${HEADERS_DIR}/include/asm/* ${CROSS_DIR}/${TARGET_SYS}/include/asm/
-
 	install -d ${CROSS_DIR}/${TARGET_SYS}/include/gnu \
 		   ${CROSS_DIR}/${TARGET_SYS}/include/bits \
 		   ${CROSS_DIR}/${TARGET_SYS}/include/rpcsvc
@@ -199,7 +153,7 @@ do_stage() {
 	done
 
 	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/
+		install -m 0644 ${B}/$i ${CROSS_DIR}/${TARGET_SYS}/lib/ || die "failed to install $i"
 	done
 	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libpthread.so
 	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so