From e762a6d38f2e654d2d45b409321066cb68a6bdc5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Feb 2012 12:42:45 +0100 Subject: [PATCH] eglibc: update to eglibc-2.15 Signed-off-by: Stephan Raue --- packages/toolchain/devel/eglibc/meta | 2 +- .../eglibc-2.14.1-15769-select_fd_type.patch | 23 ------------------- ....patch => eglibc-2.15-17022-bad-fix.patch} | 0 ...ch => eglibc-2.15-17022-libgcc_eh-1.patch} | 0 ...> eglibc-2.15-17022-restore-rpc+nis.patch} | 0 .../eglibc-2.15-17022-select_fd_type.patch | 21 +++++++++++++++++ 6 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-select_fd_type.patch rename packages/toolchain/devel/eglibc/patches/{eglibc-2.14.1-15769-bad-fix.patch => eglibc-2.15-17022-bad-fix.patch} (100%) rename packages/toolchain/devel/eglibc/patches/{eglibc-2.14.1-15769-libgcc_eh-1.patch => eglibc-2.15-17022-libgcc_eh-1.patch} (100%) rename packages/toolchain/devel/eglibc/patches/{eglibc-2.14.1-15769-restore-rpc+nis.patch => eglibc-2.15-17022-restore-rpc+nis.patch} (100%) create mode 100644 packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-select_fd_type.patch diff --git a/packages/toolchain/devel/eglibc/meta b/packages/toolchain/devel/eglibc/meta index ff1819032f..a2c2609ed8 100644 --- a/packages/toolchain/devel/eglibc/meta +++ b/packages/toolchain/devel/eglibc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="eglibc" -PKG_VERSION="2.14.1-15769" +PKG_VERSION="2.15-17022" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-select_fd_type.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-select_fd_type.patch deleted file mode 100644 index c994d1f6b5..0000000000 --- a/packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-select_fd_type.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-bad-fix.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-bad-fix.patch similarity index 100% rename from packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-bad-fix.patch rename to packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-bad-fix.patch diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-libgcc_eh-1.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-libgcc_eh-1.patch similarity index 100% rename from packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-libgcc_eh-1.patch rename to packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-libgcc_eh-1.patch diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-restore-rpc+nis.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-restore-rpc+nis.patch similarity index 100% rename from packages/toolchain/devel/eglibc/patches/eglibc-2.14.1-15769-restore-rpc+nis.patch rename to packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-restore-rpc+nis.patch diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-select_fd_type.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-select_fd_type.patch new file mode 100644 index 0000000000..6b1b7674ec --- /dev/null +++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.15-17022-select_fd_type.patch @@ -0,0 +1,21 @@ +diff -Naur eglibc-2.15-17022/misc/sys/select.h eglibc-2.15-17022.patch/misc/sys/select.h +--- eglibc-2.15-17022/misc/sys/select.h 2012-02-07 05:47:47.000000000 +0100 ++++ eglibc-2.15-17022.patch/misc/sys/select.h 2012-02-07 06:12:34.237528007 +0100 +@@ -52,14 +52,14 @@ + + + /* 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 this macros. */ + #undef __NFDBITS + /* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ + #define __NFDBITS (8 * (int) sizeof (__fd_mask)) +-#define __FD_ELT(d) ((d) / __NFDBITS) +-#define __FD_MASK(d) ((__fd_mask) 1 << ((d) % __NFDBITS)) ++#define __FD_ELT(d) (((unsigned long int)d) / __NFDBITS) ++#define __FD_MASK(d) ((__fd_mask) 1 << (((unsigned long int)d) % __NFDBITS)) + + /* fd_set for select and pselect. */ + typedef struct