From d03614f2790cf7940d642187b65dad62df62a1cf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 15 Dec 2010 02:25:33 +0100 Subject: [PATCH] eglibc: update to eglibc-2.12-12297, remove unneeded patch, add patch from minimyth Signed-off-by: Stephan Raue --- packages/toolchain/devel/eglibc/meta | 2 +- .../eglibc-2.12-12025-cv_gnu89_inline.patch | 12 ---------- ...ch => eglibc-2.12-12297-libgcc_eh-1.patch} | 0 .../eglibc-2.12-12297-select_fd_type.patch | 23 +++++++++++++++++++ 4 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 packages/toolchain/devel/eglibc/patches/eglibc-2.12-12025-cv_gnu89_inline.patch rename packages/toolchain/devel/eglibc/patches/{eglibc-2.12-12025-libgcc_eh-1.patch => eglibc-2.12-12297-libgcc_eh-1.patch} (100%) create mode 100644 packages/toolchain/devel/eglibc/patches/eglibc-2.12-12297-select_fd_type.patch diff --git a/packages/toolchain/devel/eglibc/meta b/packages/toolchain/devel/eglibc/meta index a60996000b..565997bbfd 100644 --- a/packages/toolchain/devel/eglibc/meta +++ b/packages/toolchain/devel/eglibc/meta @@ -1,5 +1,5 @@ PKG_NAME="eglibc" -PKG_VERSION="2.12-12025" +PKG_VERSION="2.12-12297" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12025-cv_gnu89_inline.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12025-cv_gnu89_inline.patch deleted file mode 100644 index 0f854a8bba..0000000000 --- a/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12025-cv_gnu89_inline.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- glibc-2.9/configure.in~ 2008-11-14 21:25:46.000000000 +0200 -+++ glibc-2.9/configure.in 2009-01-05 18:03:46.169335285 +0200 -@@ -1664,7 +1664,7 @@ - libc_cv_gnu89_inline=no - fi - rm -f conftest*]) --if test $libc_cv_gnu89_inline = yes; then -+if test "$libc_cv_gnu89_inline" != no; then - libc_cv_gnu89_inline=-fgnu89-inline - else - libc_cv_gnu89_inline= - diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12025-libgcc_eh-1.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12297-libgcc_eh-1.patch similarity index 100% rename from packages/toolchain/devel/eglibc/patches/eglibc-2.12-12025-libgcc_eh-1.patch rename to packages/toolchain/devel/eglibc/patches/eglibc-2.12-12297-libgcc_eh-1.patch diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12297-select_fd_type.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12297-select_fd_type.patch new file mode 100644 index 0000000000..c994d1f6b5 --- /dev/null +++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.12-12297-select_fd_type.patch @@ -0,0 +1,23 @@ +diff -Naur glibc-2.12.2-old/misc/sys/select.h glibc-2.12.2-new/misc/sys/select.h +--- glibc-2.12.2-old/misc/sys/select.h 2010-12-13 02:47:26.000000000 -0800 ++++ glibc-2.12.2-new/misc/sys/select.h 2010-12-13 17:46:02.000000000 -0800 +@@ -52,7 +52,7 @@ + + + /* The fd_set member is required to be an array of longs. */ +-typedef long int __fd_mask; ++typedef unsigned long int __fd_mask; + + /* Some versions of define these macros. */ + #undef __NFDBITS +@@ -60,8 +60,8 @@ + #undef __FDMASK + /* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ + #define __NFDBITS (8 * (int) sizeof (__fd_mask)) +-#define __FDELT(d) ((d) / __NFDBITS) +-#define __FDMASK(d) ((__fd_mask) 1 << ((d) % __NFDBITS)) ++#define __FDELT(d) (((unsigned long int)d) / __NFDBITS) ++#define __FDMASK(d) ((__fd_mask) 1 << (((unsigned long int)d) % __NFDBITS)) + + /* fd_set for select and pselect. */ + typedef struct