From c17c5e6feb0bd2c59bf186fe882774403529cd6f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 24 Apr 2009 17:22:07 +0200 Subject: [PATCH] glibc: add a patch to remove dup redefinitions. Will submit it upstream later. --HG-- extra : convert_revision : 1adae11174fc0c4501be7ccc75c1fa89efb6e519 --- templates/glibc/template | 1 + templates/glibc/xattr.h-dupdefs.diff | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 templates/glibc/xattr.h-dupdefs.diff diff --git a/templates/glibc/template b/templates/glibc/template index 60102dd0801..cdf34690d3b 100644 --- a/templates/glibc/template +++ b/templates/glibc/template @@ -2,6 +2,7 @@ pkgname=glibc sourcepkg=glibc version=2.9 +patch_files="xattr.h-dupdefs.diff" # Uncomment these lines to use a snapshot from Redhat. #glibc_snapdate=20090209 #wrksrc="$pkgname-$version-$glibc_snapdate" diff --git a/templates/glibc/xattr.h-dupdefs.diff b/templates/glibc/xattr.h-dupdefs.diff new file mode 100644 index 00000000000..821a2cb28fe --- /dev/null +++ b/templates/glibc/xattr.h-dupdefs.diff @@ -0,0 +1,12 @@ +--- misc/sys/xattr.h.orig 2009-04-24 15:56:12.517504626 +0200 ++++ misc/sys/xattr.h 2009-04-24 15:56:27.825593128 +0200 +@@ -30,9 +30,7 @@ __BEGIN_DECLS + 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 + }; + + /* Set the attribute NAME of the file pointed to by PATH to VALUE (which