From: Bernhard Walle <bernhard@bwalle.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/2] libcap: Fix build on non-Linux host
Date: Sun, 8 Apr 2012 19:11:00 +0200 [thread overview]
Message-ID: <1333905060-19627-3-git-send-email-bernhard@bwalle.de> (raw)
In-Reply-To: <1333905060-19627-1-git-send-email-bernhard@bwalle.de>
The patch has been already sent upstream (in a lightly different
variant). For now, it works.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
.../0002-Fix-build-on-non-Linux-host.patch | 41 ++++++++++++++++++++
patches/libcap-2.21/series | 4 +-
2 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch
diff --git a/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch b/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch
new file mode 100644
index 0000000..b226906
--- /dev/null
+++ b/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch
@@ -0,0 +1,41 @@
+From dd53fb42020b5a0612870924dd95e3a488ddf13d Mon Sep 17 00:00:00 2001
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Sun, 8 Apr 2012 17:55:56 +0200
+Subject: [PATCH] Fix build on non-Linux host
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ libcap/include/linux/capability.h | 6 ++++++
+ libcap/include/sys/capability.h | 1 -
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
+index 4924f2a..6d2fdaf 100644
+--- a/libcap/include/linux/capability.h
++++ b/libcap/include/linux/capability.h
+@@ -13,7 +13,13 @@
+ #ifndef _LINUX_CAPABILITY_H
+ #define _LINUX_CAPABILITY_H
+
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include <stdint.h>
++typedef uint32_t __u32;
++typedef uint32_t __le32;
++#endif
+
+ struct task_struct;
+
+diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
+index 4b54acc..d6ef07f 100644
+--- a/libcap/include/sys/capability.h
++++ b/libcap/include/sys/capability.h
+@@ -21,7 +21,6 @@ extern "C" {
+
+ #include <sys/types.h>
+ #include <stdint.h>
+-#include <linux/types.h>
+
+ /*
+ * Required to limit what gets defined in the kernel header file.
diff --git a/patches/libcap-2.21/series b/patches/libcap-2.21/series
index ab798c0..d16ef28 100644
--- a/patches/libcap-2.21/series
+++ b/patches/libcap-2.21/series
@@ -1,3 +1,5 @@
# generated by git-ptx-patches
+#tag:base --start-number 1
0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
-# 1d206f03899ee1c148cbf9652fc1aec3 - git-ptx-patches magic
+0002-Fix-build-on-non-Linux-host.patch
+# 187508e7e810aa0efb7a7ad4d7af2d9e - git-ptx-patches magic
--
1.7.9.5
--
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2012-04-08 17:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-08 17:10 [ptxdist] Darwin fixes: fontconfig and libcap Bernhard Walle
2012-04-08 17:10 ` [ptxdist] [PATCH 1/2] fontconfig: Fix Darwin build Bernhard Walle
2012-04-08 17:11 ` Bernhard Walle [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1333905060-19627-3-git-send-email-bernhard@bwalle.de \
--to=bernhard@bwalle.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox