1 files changed, 46 insertions, 79 deletions

diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index bb0b3643bc..18392b5c17 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -22,26 +22,32 @@ python __anonymous () {
 PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
-           virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers ncurses-native pax-utils-native"
+           virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers ncurses-native pax-utils-native"
+RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
 # Blackfin needs a wrapper around ld
-DEPENDS_append_bfin = " elf2flt "
+#DEPENDS_append_bfin = " elf2flt "
 
 INHIBIT_DEFAULT_DEPS = "1"
 PARALLEL_MAKE = ""
 
 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"
@@ -61,19 +67,20 @@ RPROVIDES_uclibc-dev += "libc-dev"
 UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz"
 UCLIBC_LOCALE_FILE_arm = "uClibc-locale-030818.arm.tgz"
 UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
-UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${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"
-
-UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${prefix}"
+           file://uClibc.config \
+           http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2 \
+          "
 
 # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
 # the CFLAGS (for when building the utils).
-OEMAKE_NO_CC = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true' 'LD=${LD}' \
+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_sysroot = "${OEMAKE_NO_CC}"
+EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${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}"
@@ -94,7 +101,10 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \
                 s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
                 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 is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) == "yes"]}'
+                ${@["","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) in ['mips', 'mipsel', 'avr32']]} \
+               '
+
 CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}"
 
 python () {
@@ -133,84 +143,41 @@ do_configure() {
 
         # Mangle the resulting .config depending on OE variables
         perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=${TARGET_ARCH}\nCROSS=${TARGET_PREFIX},g' ${S}/Rules.mak
+        sed -i -e s:'$(CROSS)strip':true: ${S}/Rules.mak        
         perl -i -p -e '${configmangle}' ${S}/.config
 
         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
 }
 
-do_stage() {
-        # This MUST be done first because we
-        # will install crt1.o in the install_dev stage and gcc needs it
-
-        # Install into the staging dir
-        oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-                install_dev install_runtime
-
-        # Install into the staging dir
-        oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-                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
-        )
-
-        # This conflicts with the c++ version of this header
-        rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
-}
-
 do_install() {
-        # Tis MUST be done first because we
-        # will install crt1.o in the install_dev stage and gcc needs it)
-        oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-                RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-                install_dev install_runtime
-
         oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
                 install_dev install_runtime 
 
+        # Need to overwrite the version from -initial
+        if [ ! -e ${D}${libdir}/libc.so ]; then
+                ln -s ../../lib/libc.so.0 ${D}${libdir}/libc.so
+        fi
+
         # We don't really need this in ${includedir}
         rm -f ${D}${prefix}/include/.cvsignore
 
         # This conflicts with the c++ version of this header
         rm -f ${D}${prefix}/include/bits/atomicity.h
 
-        # ugh.. uclibc doesn't like obeying our path variables.
-        if [ "${includedir}" != "${prefix}/include" ]; then
-                install -d ${D}${includedir}
-                mv ${D}${prefix}/include/* ${D}${includedir}/
-                rmdir ${D}${prefix}/include
-        fi
-
-        if [ "${libdir}" != "${prefix}/lib" ]; then
-                install -d ${D}${libdir}
-                mv ${D}${prefix}/lib/* ${D}${libdir}/
-                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 utils
-        oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+        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}/*
 }