klibc: update to 1.5 remove old non-working versions

* build shared klibc-utils
* set CC="${TARGET_PREFIX}klcc" if you want to compile against klibc

1 files changed, 5 insertions, 38 deletions

diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc
index 146968eaf0..87f806dfe2 100644
--- a/packages/klibc/klibc-common.inc
+++ b/packages/klibc/klibc-common.inc
@@ -5,31 +5,9 @@ use with initramfs.  It is deliberately written for small size, \
 minimal entaglement, and portability, not speed."
 LICENSE = "BSD-ADV"
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
-SRC_URI += "file://install.patch;patch=1"
 S = "${WORKDIR}/klibc-${PV}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# for the correct kernel staging path
-# inherit module-base
-
-EXTRA_OEMAKE = "'ARCH=${KLIBC_ARCH}' \
-		'CROSS=${TARGET_PREFIX}' \
-		'CC=${HOST_PREFIX}gcc' \
-		'LD=${HOST_PREFIX}ld' \
-		'AR=${AR}' \
-		'RANLIB=${RANLIB}' \
-		'NM=${TARGET_PREFIX}nm' \
-		'STRIP=echo' \
-		'SHLIBDIR=/lib' \
-		'HOST_CC=${BUILD_CC}' \
-		'HOST_CFLAGS=${BUILD_CFLAGS}' \
-		'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
-		'HOST_LIBS=' \
-		'LDFLAGS=' \
-		'ARCHREQFLAGS=${HOST_CC_ARCH}' \
-		'OPTFLAGS=${TARGET_CFLAGS}' \
-		'mandir=${mandir}'"
-
 KLIBC_ARCH = '${TARGET_ARCH}'
 KLIBC_ARCH_armeb = 'arm'
 KLIBC_ARCH_mipsel = 'mips'
@@ -38,25 +16,14 @@ KLIBC_ARCH_mipsel = 'mips'
 # could be fixed, but for the moment:
 ARM_INSTRUCTION_SET = "arm"
 
-TARGET_CFLAGS := "${@oe_filter_out('-I\S+', '${TARGET_CFLAGS}', d)} -I${STAGING_KERNEL_DIR}/include"
-
-INSTALLDIR = "/usr/lib/klibc"
-INSTALLPREFIX = "${INSTALLDIR}/${TARGET_PREFIX}"
-INSTALLBINDIR = "${INSTALLPREFIX}bin"
-INSTALLLIBDIR = "${INSTALLPREFIX}lib"
-INSTALLINCDIR = "${INSTALLPREFIX}include"
+SRC_URI_append_linux-gnueabi = "\
+			       	file://klibc-config-eabi.patch;patch=1"
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-dev ${PN}-doc"
-
-FILES_${PN} = "/lib/*.so* ${INSTALLBINDIR}"
-FILES_${PN}-dev = "/usr/bin ${INSTALLINCDIR} ${INSTALLLIBDIR}"
+EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
+                'CROSS_COMPILE=${TARGET_PREFIX}' \
+                "
 
 do_configure () {
 	ln -sf ${STAGING_KERNEL_DIR} linux
 }
 
-do_install() {
-	# The installed -dev won't work because it has the cross compiler
-	# path compiled in.
-	oe_runmake 'INSTALLROOT=${D}' install
-}