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 f2f3e9b..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
@@ -35,15 +36,18 @@ PACKAGES =+ "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db"
 LEAD_SONAME = "libc.so"
 
 # The last line (gdb and lib1) is for uclinux-uclibc builds 
-uclibc_baselibs = "/lib/libcrypt*.so* /lib/libdl*.so \
-                  /lib/libintl*.so* /lib/libm*.so \
-                  /lib/libnsl*.so* /lib/libpthread*.so \
-                  /lib/libresolv*.so* /lib/libutil*.so \
-                  /lib/libuClibc*.so* /lib/ld*.so* \
-                  /lib/libc*.so* /lib/libdl*.so* \
-                  /lib/libm*.so* /lib/libutil*.so* \
-                  /lib/libpthread*.so* /lib/librt*.so* \
-                   /usr/lib/libc.gdb /usr/lib/libc /lib/lib1.so \
+uclibc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so \
+                  ${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so \
+                  ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so \
+                  ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so \
+                   ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so \
+                  ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \
+                   ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so \
+                  ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so \
+                   ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so \
+                  ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so \
+                   ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so \
+                   ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \
                    "
 FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
               ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
@@ -66,8 +70,9 @@ UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
 UCLIBC_LOCALE_URI_arm = "http://wiki.openembedded.net/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
 
 SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
-          file://uClibc.config"
-
+          file://uClibc.config \
+           http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
+          "
 UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
 
 # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
@@ -75,8 +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}'"
-EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"
+               '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}"
@@ -95,7 +100,7 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \
                s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="/lib",; \
                s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
                ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \
-               ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) == "avr32"]} \
+               ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) in ['mips', 'mipsel', 'avr32']]} \
                '
 
 CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
@@ -141,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
 }
 
@@ -202,17 +208,17 @@ do_install() {
                rmdir ${D}${prefix}/lib
        fi
 
-       if [ "${bindir}" != "/usr/bin" ]; then
-               install -d ${D}${bindir}
-               mv ${D}/usr/bin/* ${D}${bindir}/
-               rmdir ${D}/usr/bin
-       fi
-
         oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils
         oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
                 install_utils
        
        # oe_runstrip needs +x on files 
        chmod +x ${D}/${base_libdir}/*
+
+       if [ "${bindir}" != "/usr/bin" ]; then
+               install -d ${D}${bindir}
+               mv ${D}/usr/bin/* ${D}${bindir}/
+               rmdir ${D}/usr/bin
+       fi
 }