diff --git a/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf b/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf index f2adccd051..9d3324e596 100644 --- a/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf +++ b/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf @@ -1 +1,3 @@ UCLIBC_MALLOC_DEBUGGING=y +# DOSTRIP is not set +SUPPORT_LD_DEBUG=y \ No newline at end of file diff --git a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf index b61ab7a8ea..d181faa44d 100644 --- a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf +++ b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf @@ -160,9 +160,9 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y +# UCLIBC_HAS_LOCALE is not set # UCLIBC_PREGENERATED_LOCALE_DATA is not set -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_XLOCALE is not set # UCLIBC_HAS_HEXADECIMAL_FLOATS is not set # UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set # UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set diff --git a/packages/toolchain/devel/uClibc/install b/packages/toolchain/devel/uClibc/install index 96533430af..6d1d4fdfe2 100755 --- a/packages/toolchain/devel/uClibc/install +++ b/packages/toolchain/devel/uClibc/install @@ -28,7 +28,7 @@ # needed by dbus-glib cp $PKG_BUILD/lib/libnsl.so.0 $INSTALL/lib - [ "$DEBUG" = yes ] && cp $PKG_BUILD/lib/libthread_db.so.1 $INSTALL/lib + [ "$DEVTOOLS" = yes ] && cp $PKG_BUILD/lib/libthread_db.so.1 $INSTALL/lib [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libcrypt.so.0 $INSTALL/lib [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libresolv.so.0 $INSTALL/lib diff --git a/packages/toolchain/devel/uClibc/patches/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.diff b/packages/toolchain/devel/uClibc/patches/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.diff deleted file mode 100644 index 62563ceb98..0000000000 --- a/packages/toolchain/devel/uClibc/patches/900-backport_fix_possible_null_ptr_dereference_in_getaddrinfo.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libc/inet/getaddrinfo.c -+++ b/libc/inet/getaddrinfo.c -@@ -187,6 +187,8 @@ - } - - for (runp = ifa; runp != NULL; runp = runp->ifa_next) { -+ if (runp->ifa_addr == NULL) -+ continue; - #if defined __UCLIBC_HAS_IPV4__ - if (runp->ifa_addr->sa_family == PF_INET) - seen |= SEEN_IPV4; diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-fix_getline-upstream.diff b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-fix_getline-upstream.diff deleted file mode 100644 index 3ff3212c01..0000000000 --- a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-fix_getline-upstream.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur uClibc-0.9.30.1/extra/scripts/unifdef.c uClibc-0.9.30.1.patch/extra/scripts/unifdef.c ---- uClibc-0.9.30.1/extra/scripts/unifdef.c 2008-04-28 01:10:00.000000000 +0200 -+++ uClibc-0.9.30.1.patch/extra/scripts/unifdef.c 2009-04-06 13:19:01.225263004 +0200 -@@ -206,7 +206,7 @@ - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1_ppoll_fix_and_upstream.diff b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1_ppoll_fix_and_upstream.diff deleted file mode 100644 index 33325334f2..0000000000 --- a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1_ppoll_fix_and_upstream.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur uClibc-0.9.30.1/libc/sysdeps/linux/common/ppoll.c uClibc-0.9.30.1.patch/libc/sysdeps/linux/common/ppoll.c ---- uClibc-0.9.30.1/libc/sysdeps/linux/common/ppoll.c 2008-10-24 10:34:31.000000000 +0200 -+++ uClibc-0.9.30.1.patch/libc/sysdeps/linux/common/ppoll.c 2009-08-15 18:32:11.166479655 +0200 -@@ -17,6 +17,7 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include - #include - #include - -@@ -24,26 +25,19 @@ - - libc_hidden_proto(ppoll) - --# define __NR___libc_ppoll __NR_ppoll --static __always_inline --_syscall4(int, __libc_ppoll, struct pollfd *, fds, -- nfds_t, nfds, const struct timespec *, timeout, -- const __sigset_t *, sigmask) -- - int --ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, -- const __sigset_t *sigmask) -+ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout, -+ const sigset_t *sigmask) - { -- /* The Linux kernel can in some situations update the timeout value. -- We do not want that so use a local variable. */ -- struct timespec tval; -- if (timeout != NULL) -- { -- tval = *timeout; -- timeout = &tval; -- } -+ /* The Linux kernel can in some situations update the timeout value. -+ We do not want that so use a local variable. */ -+ struct timespec tval; -+ if (timeout != NULL) { -+ tval = *timeout; -+ timeout = &tval; -+ } - -- return __libc_ppoll(fds, nfds, timeout, sigmask); -+ return INLINE_SYSCALL(ppoll, 5, fds, nfds, timeout, sigmask, _NSIG / 8); - } - libc_hidden_def(ppoll) - diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff new file mode 100644 index 0000000000..4dc8f9ae05 --- /dev/null +++ b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff @@ -0,0 +1,10 @@ +diff -Naur uClibc-0.9.30.2-20091017/libc/string/strlcpy.c uClibc-0.9.30.2-20091017.patch/libc/string/strlcpy.c +--- uClibc-0.9.30.2-20091017/libc/string/strlcpy.c 2009-10-16 11:41:34.000000000 +0200 ++++ uClibc-0.9.30.2-20091017.patch/libc/string/strlcpy.c 2009-10-19 00:01:37.991090010 +0200 +@@ -59,6 +59,5 @@ + #else + #ifndef __UCLIBC_HAS_LOCALE__ + strong_alias(__wcslcpy,wcsxfrm) +-libc_hidden_def(wcsxfrm) + #endif + #endif diff --git a/packages/toolchain/devel/uClibc/url b/packages/toolchain/devel/uClibc/url index 4f8022b3d0..eaba0af9b0 100644 --- a/packages/toolchain/devel/uClibc/url +++ b/packages/toolchain/devel/uClibc/url @@ -1 +1 @@ -http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/uClibc-0.9.30.2-20091017.tar.bz2 \ No newline at end of file