From 61cb296a8f043865655660e50d4ecef3c9b8e71a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 17 Mar 2014 14:00:31 +0100 Subject: [PATCH] glibc: re-add old xattr patch, which is required to build qemu. --- .../patches/glibc-2.18-xattr-compat-hack.patch | 18 ++++++++++++++++++ srcpkgs/glibc/template | 7 +++---- 2 files changed, 21 insertions(+), 4 deletions(-) create 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 new file mode 100644 index 00000000000..a44d510a23e --- /dev/null +++ b/srcpkgs/glibc/patches/glibc-2.18-xattr-compat-hack.patch @@ -0,0 +1,18 @@ +--- 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 76d4368273b..342e0dee68d 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,11 +1,8 @@ # Template file for 'glibc' pkgname=glibc version=2.19 -revision=3 +revision=4 bootstrap=yes -# Force creation of -dbg pkg, required by valgrind. -force_debug_pkgs=yes -patch_args="-Np1" short_desc="The GNU C library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libc" @@ -27,6 +24,8 @@ conf_files=" /etc/rpc /etc/gai.conf /etc/ld.so.conf" +# Force creation of -dbg pkg, required by valgrind. +force_debug_pkgs=yes if [ "$CHROOT_READY" ]; then hostmakedepends="bison perl"