Resurrect initial libc pass, for the moment.

BKrev: 41182bc2JFBvoGiaKIvQ1VltLvXTVw

8 files changed, 162 insertions, 0 deletions

diff --git a/gcc/gcc-cross-initial_3.3.3.oe b/gcc/gcc-cross-initial_3.3.3.oe
index ddf303cc69..ae53897594 100644
--- a/gcc/gcc-cross-initial_3.3.3.oe
+++ b/gcc/gcc-cross-initial_3.3.3.oe
@@ -1,6 +1,7 @@
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
 # This is intended to be a -very- basic config
diff --git a/gcc/gcc-cross-initial_3.3.4.oe b/gcc/gcc-cross-initial_3.3.4.oe
index ddf303cc69..ae53897594 100644
--- a/gcc/gcc-cross-initial_3.3.4.oe
+++ b/gcc/gcc-cross-initial_3.3.4.oe
@@ -1,6 +1,7 @@
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
 # This is intended to be a -very- basic config
diff --git a/gcc/gcc-cross-initial_3.4.0.oe b/gcc/gcc-cross-initial_3.4.0.oe
index 9e4e70d45d..933de58b7e 100644
--- a/gcc/gcc-cross-initial_3.4.0.oe
+++ b/gcc/gcc-cross-initial_3.4.0.oe
@@ -1,6 +1,7 @@
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
 PACKAGES = ""
diff --git a/gcc/gcc-cross-initial_3.4.1.oe b/gcc/gcc-cross-initial_3.4.1.oe
index 9e4e70d45d..933de58b7e 100644
--- a/gcc/gcc-cross-initial_3.4.1.oe
+++ b/gcc/gcc-cross-initial_3.4.1.oe
@@ -1,6 +1,7 @@
 include gcc-cross_${PV}.oe
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][oe.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'mips', 'mipsel']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 
 PACKAGES = ""
diff --git a/glibc/glibc-initial_2.3.2.oe b/glibc/glibc-initial_2.3.2.oe
new file mode 100644
index 0000000000..fa740358b7
--- /dev/null
+++ b/glibc/glibc-initial_2.3.2.oe
@@ -0,0 +1,47 @@
+include glibc_${PV}.oe
+
+DEPENDS = "patcher-native linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '%s/glibc-%s' % (os.path.dirname(oe.data.getVar('FILE', d, 1)) ], d), oe.data.getVar('PV', d, 1))}"
+
+PACKAGES = ""
+
+do_configure () {
+	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+	chmod +x ${S}/configure
+	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+		--without-cvs --disable-sanity-checks --with-headers=${HEADERS_DIR}/include \
+		--enable-hacker-mode
+	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
+		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
+		# Another workaround might be to tell configure to not use any cross options to $(CC).
+		# The real fix would be to get install-headers to not generate errlist-compat.c.
+		make sysdeps/gnu/errlist.c
+		mkdir -p stdio-common
+		touch stdio-common/errlist-compat.c
+	fi
+}
+
+do_compile () {
+	:
+}
+
+do_stage () {
+	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+
+	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
+	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
+	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	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/
+}
+
+do_install () {
+	:
+}
diff --git a/glibc/glibc-initial_cvs.oe b/glibc/glibc-initial_cvs.oe
new file mode 100644
index 0000000000..6ca2af6ce4
--- /dev/null
+++ b/glibc/glibc-initial_cvs.oe
@@ -0,0 +1,47 @@
+include glibc_${PV}.oe
+
+DEPENDS = "patcher-native linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+FILESPATH = "${@base_set_filespath([ '%s/glibc-cvs' % os.path.dirname(oe.data.getVar('FILE', d, 1)) ], d)}"
+
+PACKAGES = ""
+
+do_configure () {
+	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+	chmod +x ${S}/configure
+	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+		--without-cvs --disable-sanity-checks --with-headers=${HEADERS_DIR}/include \
+		--enable-hacker-mode
+	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
+		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
+		# Fortunately, we don't need errlist-compat.c, since we just need .h files, 
+		# so work around this by creating a fake errlist-compat.c and satisfying its dependencies.
+		# Another workaround might be to tell configure to not use any cross options to $(CC).
+		# The real fix would be to get install-headers to not generate errlist-compat.c.
+		make sysdeps/gnu/errlist.c
+		mkdir -p stdio-common
+		touch stdio-common/errlist-compat.c
+	fi
+}
+
+do_compile () {
+	:
+}
+
+do_stage () {
+	oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+
+	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
+	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include/gnu
+	touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
+	cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+	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/
+}
+
+do_install () {
+	:
+}
diff --git a/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe b/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe
new file mode 100644
index 0000000000..8ff9aecbe3
--- /dev/null
+++ b/uclibc-snapshot/uclibc-snapshot-initial_cvs.oe
@@ -0,0 +1,32 @@
+include uclibc-snapshot_cvs.oe
+
+FILESPATH = "${@base_set_filespath([ '%s/uclibc-snapshot' % os.path.dirname(oe.data.getVar('FILE', d, 1)) ], d)}"
+
+DEPENDS = "patcher-native linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_stage() {
+	# Install initial headers into the cross dir
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+		pregen install_dev
+
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+}
+
+do_install() {
+	:
+}
+
+do_compile () {
+	:
+}
+
diff --git a/uclibc/uclibc-initial_0.9.26.oe b/uclibc/uclibc-initial_0.9.26.oe
new file mode 100644
index 0000000000..d838cbfc48
--- /dev/null
+++ b/uclibc/uclibc-initial_0.9.26.oe
@@ -0,0 +1,32 @@
+include uclibc_${PV}.oe
+
+FILESPATH = "${@base_set_filespath([ '%s/uclibc-%s' % (os.path.dirname(oe.data.getVar('FILE', d, 1)) ], d), oe.data.getVar('PV', d, 1))}"
+
+DEPENDS = "patcher-native linux-libc-headers"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_stage() {
+	# Install initial headers into the cross dir
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
+		pregen install_dev
+
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
+	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
+	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+	rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
+}
+
+do_install() {
+	:
+}
+
+do_compile () {
+	:
+}
+