diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index c20cc5b011..6f7be0c80d 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="glibc" -PKG_VERSION="2.19" +PKG_VERSION="2.20" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" @@ -109,6 +109,7 @@ libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes libc_cv_ssp=no libc_cv_ctors_header=yes +libc_cv_slibdir=/lib EOF echo "libdir=/usr/lib" >> configparms diff --git a/packages/devel/glibc/patches/glibc-select_fd_type.patch b/packages/devel/glibc/patches/glibc-select_fd_type.patch deleted file mode 100644 index 6b1b7674ec..0000000000 --- a/packages/devel/glibc/patches/glibc-select_fd_type.patch +++ /dev/null @@ -1,21 +0,0 @@ -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