From: Tom Rini <tom_rini@mentor.com>
Date: Sat, 26 Feb 2011 16:43:31 +0000 (-0700)
Subject: Revert "libcap2: Fix uClibc build"
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf79b8822f67d341d212bd473ffed4e6a1c95f53;p=openembedded.git

Revert "libcap2: Fix uClibc build"

Petr Štetiar pointed out that I just switched this to using
attr/xattr.h from e2fsprogs or similar rather than correctly fixing this.

This reverts commit 150102aaf8226fcb56101ad0fbeda00ca95aef72.
---

diff --git a/recipes/libcap/libcap2/fix-uclibc-build.patch b/recipes/libcap/libcap2/fix-uclibc-build.patch
deleted file mode 100644
index d42736eb1b..0000000000
--- a/recipes/libcap/libcap2/fix-uclibc-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libcap-2.20/libcap/cap_file.c
-===================================================================
---- libcap-2.20.orig/libcap/cap_file.c
-+++ libcap-2.20/libcap/cap_file.c
-@@ -5,7 +5,11 @@
-  */
- 
- #include <sys/types.h>
-+#ifdef __UCLIBC__
-+#include <attr/xattr.h>
-+#else
- #include <sys/xattr.h>
-+#endif
- #include <byteswap.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/recipes/libcap/libcap2_2.20.bb b/recipes/libcap/libcap2_2.20.bb
index f4b8401c1f..8f7dc3bf8d 100644
--- a/recipes/libcap/libcap2_2.20.bb
+++ b/recipes/libcap/libcap2_2.20.bb
@@ -11,7 +11,6 @@ LDFLAGS =+ "-L../libcap"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/security/linux-privs/libcap2/libcap-${PV}.tar.bz2 \
 	   file://make.patch \
-	   file://fix-uclibc-build.patch \
 	"
 
 SRC_URI[md5sum] = "10e47ed32ca2214eb0e58780282d27b4"