fix uclibc build so it actually works, nuke unworking old version too

BKrev: 4085e2edZPSelFj-Oq288Wpg8sdztA

6 files changed, 42 insertions, 159 deletions

diff --git a/uclibc/uclibc-0.9.21/uClibc.config b/uclibc/uclibc-0.9.21/uClibc.config
deleted file mode 100644
index e69de29bb2..0000000000
--- a/uclibc/uclibc-0.9.21/uClibc.config
+++ /dev/null
diff --git a/uclibc/uclibc-0.9.21/uClibc.config.arm b/uclibc/uclibc-0.9.21/uClibc.config.arm
deleted file mode 100644
index e69de29bb2..0000000000
--- a/uclibc/uclibc-0.9.21/uClibc.config.arm
+++ /dev/null
diff --git a/uclibc/uclibc-initial_0.9.21.oe b/uclibc/uclibc-initial_0.9.21.oe
deleted file mode 100644
index a4e9f901ce..0000000000
--- a/uclibc/uclibc-initial_0.9.21.oe
+++ /dev/null
@@ -1,23 +0,0 @@
-include uclibc_${PV}.oe
-
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
-DEPENDS = ""
-PACKAGES = ""
-
-do_stage() {
-	make 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}
-}
-
-do_install() {
-	:
-}
-
-do_compile () {
-	:
-}
-
diff --git a/uclibc/uclibc-initial_0.9.26.oe b/uclibc/uclibc-initial_0.9.26.oe
index 4a2327960f..57fa385f7f 100644
--- a/uclibc/uclibc-initial_0.9.26.oe
+++ b/uclibc/uclibc-initial_0.9.26.oe
@@ -11,7 +11,11 @@ DEPENDS = ""
 PACKAGES = ""
 
 do_stage() {
-	make pregen install_dev
+	# 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
diff --git a/uclibc/uclibc_0.9.21.oe b/uclibc/uclibc_0.9.21.oe
deleted file mode 100644
index 8586ebce93..0000000000
--- a/uclibc/uclibc_0.9.21.oe
+++ /dev/null
@@ -1,96 +0,0 @@
-DESCRIPTION = "C library for embedded systems"
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/uclibc-${PV}"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc-initial"
-PROVIDES = "virtual/libc"
-
-SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
-           http://www.uclibc.org/downloads/toolchain/kernel-headers-2.4.21.tar.bz2"
-
-S = "${WORKDIR}/uClibc-${PV}"
-
-UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
-
-EXTRA_OEMAKE = ""
-
-uclibcbuild_do_patch() {
-	rm -f ${WORKDIR}/linux/include/asm
-	ln -sf asm-${TARGET_ARCH} ${WORKDIR}/linux/include/asm
-
-	touch ${WORKDIR}/linux/include/linux/autoconf.h
-
-	echo "#define UTS_RELEASE \"2.4.21\"" > ${WORKDIR}/linux/include/linux/version.h
-	echo "#define LINUX_VERSION_CODE 132117" >> ${WORKDIR}/linux/include/linux/version.h
-	echo "#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))" \
-		>> ${WORKDIR}/linux/include/linux/version.h
-
-	if [ -f ${FILESDIR}/uClibc.config.${TARGET_ARCH} ]; then
-		cp ${FILESDIR}/uClibc.config.${TARGET_ARCH} ${S}/.config
-	else
-		cp ${FILESDIR}/uClibc.config ${S}/.config
-	fi
-
-	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
-	perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"${WORKDIR}/linux\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_TOOL_PREFIX=.*,DEVEL_TOOL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' ${S}/.config
-	perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' ${S}/.config
-	perl -i -p -e 's,^GCC_BIN.*,GCC_BIN=${CROSS_DIR}/bin/${TARGET_PREFIX}gcc,g' ${S}/extra/gcc-uClibc/Makefile
-	perl -i -p -e 's,^LD_BIN.*,LD_BIN=${CROSS_DIR}/bin/${TARGET_PREFIX}ld,g' ${S}/extra/gcc-uClibc/Makefile
-
-	make oldconfig
-	make headers
-}
-
-python do_patch () {
-	oe.build.exec_func('base_do_patch', d)
-	oe.build.exec_func('uclibcbuild_do_patch', d)
-}
-
-do_stage() {
-	make install_dev install_runtime install_utils
-
-	# Make links to ${STAGING_INCDIR} so many
-	# cross builds work easier...
-	mkdir -p ${STAGING_INCDIR}
-	for f in ${CROSS_DIR}/${TARGET_SYS}/include/*; do
-		ln -s $f ${STAGING_INCDIR}/
-	done
-
-	# We don't really need these
-	rmdir ${CROSS_DIR}/${TARGET_SYS}/${libdir} || :
-	rmdir ${CROSS_DIR}/${TARGET_SYS}/${prefix} || :
-}
-
-do_install() {
-	make DEVEL_PREFIX= SYSTEM_DEVEL_PREFIX= TARGET_PREFIX= \
-		DEVEL_TOOL_PREFIX=${prefix} PREFIX=${D} \
-		install_dev install_target install_target_utils
-
-	# binutils has a readelf, so forget about this one...
-	rm -f ${D}/${bindir}/readelf
-
-	# move devel headers/libs/objects from / into ${prefix}
-	mv -f ${D}/lib/*.a ${D}/lib/*.o ${D}${libdir}/
-	rm -f ${D}/include/.cvsignore
-	mv -f ${D}/include ${D}${prefix}/
-	for lib in libc.so libcrypt.so libdl.so libm.so libnsl.so \
-	           libpthread.so libresolv.so libthread_db.so libutil.so; do
-		ln -s ../../lib/`readlink ${D}/lib/$lib` ${D}${libdir}/$lib
-		rm -f ${D}/lib/$lib
-	done
-
-	# ensure we have a /sbin/ldconfig as some scripts expect one
-	if ! [ -e ${D}/sbin/ldconfig ]; then
-		mkdir -p ${D}/sbin
-		ln -sf ../bin/true ${D}/sbin/ldconfig
-	fi
-}
-
diff --git a/uclibc/uclibc_0.9.26.oe b/uclibc/uclibc_0.9.26.oe
index 2cbdc38079..f723f762f7 100644
--- a/uclibc/uclibc_0.9.26.oe
+++ b/uclibc/uclibc_0.9.26.oe
@@ -20,6 +20,7 @@ SRC_URI = "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
 S = "${WORKDIR}/uClibc-${PV}"
 
 UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
+UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
 
 EXTRA_OEMAKE = ""
 
@@ -42,13 +43,10 @@ uclibcbuild_do_patch() {
 
 	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
 	perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"${WORKDIR}/linux\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
-	perl -i -p -e 's,^DEVEL_TOOL_PREFIX=.*,DEVEL_TOOL_PREFIX=\"${UCLIBC_PREFIX}\",g' ${S}/.config
+	perl -i -p -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' ${S}/.config
+	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/${prefix}\",g' ${S}/.config
 	perl -i -p -e 's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' ${S}/.config
 	perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' ${S}/.config
-	#perl -i -p -e 's,^GCC_BIN.*,GCC_BIN=${CROSS_DIR}/bin/${TARGET_PREFIX}gcc,g' ${S}/extra/gcc-uClibc/Makefile
-	#perl -i -p -e 's,^LD_BIN.*,LD_BIN=${CROSS_DIR}/bin/${TARGET_PREFIX}ld,g' ${S}/extra/gcc-uClibc/Makefile
 
 	make oldconfig
 }
@@ -59,42 +57,42 @@ python do_patch () {
 }
 
 do_stage() {
-	make install_dev install_runtime install_utils
-
-	# Make links to ${STAGING_INCDIR} so many
-	# cross builds work easier...
-	mkdir -p ${STAGING_INCDIR}
-	for f in ${CROSS_DIR}/${TARGET_SYS}/include/*; do
-		ln -s $f ${STAGING_INCDIR}/
-	done
-
-	# We don't really need these
-	rmdir ${CROSS_DIR}/${TARGET_SYS}/${libdir} || :
-	rmdir ${CROSS_DIR}/${TARGET_SYS}/${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_STAGE_PREFIX}/include/.cvsignore
+
+	# Fixup shared lib symlinks
+	( cd ${UCLIBC_STAGE_PREFIX}/lib
+		for f in c crypt dl m nsl pthread resolv thread_db util; do
+			ln -sf lib${f}.so.? lib${f}.so
+		done
+	)
+
+	# Install into the cross dir
+	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_PREFIX}/include/.cvsignore
+
+	# Fixup shared lib symlinks
+	( cd ${UCLIBC_STAGE_PREFIX}/lib
+		for f in c crypt dl m nsl pthread resolv thread_db util; do
+			ln -sf lib${f}.so.? lib${f}.so
+		done
+	)
 }
 
 do_install() {
-	make DEVEL_PREFIX= SYSTEM_DEVEL_PREFIX= TARGET_PREFIX= \
-		DEVEL_TOOL_PREFIX=${prefix} PREFIX=${D}/ \
-		install_dev install_target install_target_utils
-
-	# binutils has a readelf, so forget about this one...
-	rm -f ${D}/${bindir}/readelf
-
-	# move devel headers/libs/objects from / into ${prefix}
-	mv -f ${D}/lib/*.a ${D}/lib/*.o ${D}${libdir}/
-	rm -f ${D}/include/.cvsignore
-	mv -f ${D}/include ${D}${prefix}/
-	for lib in libc.so libcrypt.so libdl.so libm.so libnsl.so \
-	           libpthread.so libresolv.so libthread_db.so libutil.so; do
-		ln -s ../../lib/`readlink ${D}/lib/$lib` ${D}${libdir}/$lib
-		rm -f ${D}/lib/$lib
-	done
-
-	# ensure we have a /sbin/ldconfig as some scripts expect one
-	if ! [ -e ${D}/sbin/ldconfig ]; then
-		mkdir -p ${D}/sbin
-		ln -sf ../bin/true ${D}/sbin/ldconfig
-	fi
+	make PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		install_dev install_runtime install_utils
+
+	# We don't really need this in /usr/include
+	rm -f ${D}/${prefix}/include/.cvsignore
 }