From cd5c32ef814524f987f69179be79e3ec9fda71c1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Sep 2014 16:55:39 +0200 Subject: [PATCH] glibc: update to 2.20. --- .../glibc-2.18-xattr-compat-hack.patch | 18 --------------- srcpkgs/glibc/template | 22 +++++++------------ 2 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/glibc/patches/glibc-2.18-xattr-compat-hack.patch diff --git a/srcpkgs/glibc/patches/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/glibc/patches/glibc-2.18-xattr-compat-hack.patch deleted file mode 100644 index a44d510a23e..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.18-xattr-compat-hack.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- misc/sys/xattr.h 2013-08-11 08:52:55.000000000 +1000 -+++ misc/sys/xattr.h 2014-01-07 15:45:50.533969040 +1000 -@@ -26,13 +26,8 @@ - - /* The following constants should be used for the fifth parameter of - `*setxattr'. */ --enum --{ -- XATTR_CREATE = 1, /* set value, fail if attr already exists. */ --#define XATTR_CREATE XATTR_CREATE -- XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */ --#define XATTR_REPLACE XATTR_REPLACE --}; -+#define XATTR_CREATE 1 -+#define XATTR_REPLACE 2 - - /* Set the attribute NAME of the file pointed to by PATH to VALUE (which - is SIZE bytes long). Return 0 on success, -1 for errors. */ diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 8ae971fa29f..681e181a806 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,14 +1,14 @@ # Template file for 'glibc' pkgname=glibc -version=2.19 -revision=7 +version=2.20 +revision=1 bootstrap=yes short_desc="The GNU C library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libc" license="GPL-2, LGPL-2.1, BSD" distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz" -checksum=2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2 +checksum=f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 # Do not strip these files, objcopy errors out. nostrip_files=" XBS5_ILP32_OFFBIG @@ -72,22 +72,20 @@ do_configure() { SHELL=/bin/bash ../configure ${configure_args} \ --bindir=/usr/bin --sbindir=/usr/sbin \ --libdir=${_libdir} --libexecdir=${_libdir} \ - --enable-add-ons=ports,nptl,libidn --enable-obsolete-rpc \ + --enable-add-ons=libidn --enable-obsolete-rpc \ --enable-multi-arch --enable-bind-now \ - --disable-profile --enable-kernel=2.6.27 \ + --disable-profile --enable-kernel=2.6.32 \ --enable-stack-guard-randomization \ - --without-selinux --without-cvs --without-gd + --without-selinux --without-cvs --without-gd \ + libc_cv_rootsbindir=/usr/sbin \ + libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir} } do_build() { cd build make ${makejobs} } - do_install() { - vmkdir usr/lib - ln -s lib ${DESTDIR}/usr/lib32 - # Create DESTDIR/etc/ld.so.conf mkdir -p ${DESTDIR}/etc echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf @@ -124,8 +122,6 @@ do_install() { esac vinstall ${wrksrc}/posix/gai.conf 644 etc - - rm -rf ${DESTDIR}/usr/lib32 rm -rf ${DESTDIR}/var/db } @@ -141,7 +137,6 @@ glibc-devel_package() { vmove usr/share/info } } - glibc-locales_package() { noarch=yes conf_files="/etc/default/libc-locales" @@ -152,7 +147,6 @@ glibc-locales_package() { vmove usr/share/locale } } - nscd_package() { conf_files="/etc/nscd.conf" short_desc+=" - Name Service Cache Daemon"