diff options
author | Khem Raj <raj.khem@gmail.com> | 2010-02-01 18:53:29 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2010-02-01 18:53:29 -0800 |
commit | fb7f42bf127885c12668f53de30fbbfd661c1117 (patch) | |
tree | 0437ae228cbc813c1fe4a2873aaefc87bc0f2cce /recipes | |
parent | f1e2a7884357cdc164f27f7414a6bc088e06e2d2 (diff) |
uclibc_git: Bump SRCREV to latest upstream.
* Delete patches that are merged upstream.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/uclibc/uclibc-git/hide-__libc-symbols.patch | 35 | ||||
-rw-r--r-- | recipes/uclibc/uclibc_git.bb | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/recipes/uclibc/uclibc-git/hide-__libc-symbols.patch b/recipes/uclibc/uclibc-git/hide-__libc-symbols.patch deleted file mode 100644 index 1d79e54d9d..0000000000 --- a/recipes/uclibc/uclibc-git/hide-__libc-symbols.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: git/libc/inet/resolv.c -=================================================================== ---- git.orig/libc/inet/resolv.c 2010-01-25 13:35:30.395472730 -0800 -+++ git/libc/inet/resolv.c 2010-01-25 13:40:18.727455693 -0800 -@@ -3016,7 +3016,7 @@ __thread struct __res_state *__resp = &_ - * relocations. - */ - extern __thread struct __res_state *__libc_resp -- __attribute__ ((alias ("__resp"))); -+ __attribute__ ((alias ("__resp"))) attribute_hidden; - # else - # undef __resp - struct __res_state *__resp = &_res; -Index: git/libc/misc/internals/errno.c -=================================================================== ---- git.orig/libc/misc/internals/errno.c 2010-01-25 13:35:30.411454765 -0800 -+++ git/libc/misc/internals/errno.c 2010-01-25 13:40:18.727455693 -0800 -@@ -4,15 +4,14 @@ - __thread int errno; - __thread int h_errno; - --extern __thread int __libc_errno __attribute__ ((alias ("errno"))); --extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))); -+extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden; -+extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden; - #define h_errno __libc_h_errno - - #else - #include "internal_errno.h" - int errno = 0; - int h_errno = 0; -- - #ifdef __UCLIBC_HAS_THREADS__ - libc_hidden_def(errno) - weak_alias(errno, _errno) diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index f251b32362..5f44466d47 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -SRCREV="37e26d6e19558d9f149722e513cb29c4374b8d8d" +SRCREV="22de495da40d7649eb28fdfc70ce1d5f3b6572ea" PV = "${UCLIBC_BASE}+gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take @@ -33,6 +33,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ file://uclibc-arm-ftruncate64.patch;patch=1 \ file://uclibc_enable_log2_test.patch;patch=1 \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ - file://hide-__libc-symbols.patch;patch=1 \ " S = "${WORKDIR}/git" |