Hi, would a simple patchl ike this to misc/sys/xattr.h be acceptable? This showed up in a failure to build (of at least qemu, and aiui lots of other pkgs) after merging a new libcap2 where sys/capability.h #included linux/xattr.h. It's being worked around by patching libcap2 to #include sys/xattr.h first, but presumably this will cause other breakages.
thanks, -serge ============================================= diff -Nru eglibc-2.19/debian/changelog eglibc-2.19/debian/changelog --- eglibc-2.19/debian/changelog 2014-02-21 07:09:22.000000000 +0000 +++ eglibc-2.19/debian/changelog 2014-02-21 23:33:08.000000000 +0000 @@ -1,3 +1,10 @@ +eglibc (2.19-0ubuntu2) trusty; urgency=medium + + * debian/patches/dont-redefine-xattr: fix compilations where linux/xattr.h + ends up included before sys/xattr.h. + + -- Serge Hallyn <[email protected]> Fri, 21 Feb 2014 23:31:58 +0000 + eglibc (2.19-0ubuntu1) trusty; urgency=medium * Merge with unreleased 2.19 from Debian experimental, remaining changes: diff -Nru eglibc-2.19/debian/patches/dont-redefine-xattr eglibc-2.19/debian/patches/dont-redefine-xattr --- eglibc-2.19/debian/patches/dont-redefine-xattr 1970-01-01 00:00:00.000000000 +0000 +++ eglibc-2.19/debian/patches/dont-redefine-xattr 2014-02-21 23:31:53.000000000 +0000 @@ -0,0 +1,25 @@ +Description: don't define XATTR_CREATE in an enum if it is already defined + Otherwise if linux/xattr.h gets included before sys/xattr.h, compilation + will fail. +Author: Serge Hallyn <[email protected]> + +Index: eglibc-2.19/misc/sys/xattr.h +=================================================================== +--- eglibc-2.19.orig/misc/sys/xattr.h 2014-01-03 17:51:28.000000000 +0000 ++++ eglibc-2.19/misc/sys/xattr.h 2014-02-21 23:29:43.141367811 +0000 +@@ -26,6 +26,7 @@ + + /* The following constants should be used for the fifth parameter of + `*setxattr'. */ ++#ifndef XATTR_CREATE + enum + { + XATTR_CREATE = 1, /* set value, fail if attr already exists. */ +@@ -33,6 +34,7 @@ + XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */ + #define XATTR_REPLACE XATTR_REPLACE + }; ++#endif + + /* 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 -Nru eglibc-2.19/debian/patches/series eglibc-2.19/debian/patches/series --- eglibc-2.19/debian/patches/series 2014-02-20 09:37:10.000000000 +0000 +++ eglibc-2.19/debian/patches/series 2014-02-21 23:29:29.000000000 +0000 @@ -230,3 +230,4 @@ ubuntu/local-disable-nscd-netgroup-caching.diff ubuntu/submitted-no-sprintf-pre-truncate.diff ubuntu/submitted-no-stack-backtrace.diff +dont-redefine-xattr -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/20140221234206.GA26198@sergelap
