OpenEmbedded: Switch to using linux-uclibceabi and linux-gnu for TARGET_OS

[openembedded.git] / recipes / uclibc / uclibc.inc

diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index 3c72366..88f62fa 100644 (file)
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "C library for embedded systems"
 LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "required"
+INC_PR = "r32"
 #
 # For now, we will skip building of a gcc package if it is a uclibc one
 # and our build is not a uclibc one, and we skip a glibc one if our build
@@ -79,7 +80,8 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
 OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \
                'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
 EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' \
-               'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}'"
+               'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}' \
+               ARCH=`grep TARGET_ARCH ${S}/.config|sed -e 's/TARGET_ARCH=//g'`"
 EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
 
 KERNEL_SOURCE = "${STAGING_INCDIR}"
@@ -144,12 +146,13 @@ do_configure() {
 
        sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config
 
-        if [ "${TARGET_OS}" = "linux-gnueabi" -o  "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
-                       echo "CONFIG_ARM_EABI=y"                >> ${S}/.config
-       else
-               echo "# CONFIG_ARM_EABI is not set"     >> ${S}/.config
+       if [ `echo ${TARGET_ARCH} | grep -e '^arm'` ]; then
+               if [ `echo ${TARGET_OS} | grep -e 'eabi$'` ]; then
+                               echo "CONFIG_ARM_EABI=y"                >> ${S}/.config
+               else
+                       echo "# CONFIG_ARM_EABI is not set"     >> ${S}/.config
+               fi
        fi
-
        yes '' | oe_runmake oldconfig
 }