diff mbox

[OpenWrt-Devel] tools/e2fsprogs: add a darwin-compat patch

Message ID d0066c8841e02c9d082df4a96a6efc2152db5d0c.1426574399.git.larry@elder-gods.org
State Accepted
Delegated to: Felix Fietkau
Headers show

Commit Message

Lawrence D'Anna March 17, 2015, 6:41 a.m. UTC 
On darwin we need to import stdint to get these integer typedefs.
---
 tools/e2fsprogs/patches/005-darwin-compat.patch | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tools/e2fsprogs/patches/005-darwin-compat.patch

Comments

Felix Fietkau March 29, 2015, 5:22 a.m. UTC | #1 
On 2015-03-17 07:41, Lawrence D'Anna wrote:
> On darwin we need to import stdint to get these integer typedefs.
It works for me on darwin without this patch. What version are you
using, and what does the error look like?

- Felix
Lawrence D'Anna March 29, 2015, 7:07 a.m. UTC | #2 
> On Mar 28, 2015, at 10:22 PM, Felix Fietkau <nbd@openwrt.org> wrote:
> 
> On 2015-03-17 07:41, Lawrence D'Anna wrote:
>> On darwin we need to import stdint to get these integer typedefs.
> It works for me on darwin without this patch. What version are you
> using, and what does the error look like?

mac os 10.10.2

make[5]: Entering directory '/Volumes/CaseSensitive/openwrt.foo/build_dir/host/e2fsprogs-1.42.8/lib/e2p'
	CC fgetflags.c
In file included from fgetflags.c:36:
In file included from ./e2p.h:14:
In file included from ../../lib/ext2fs/ext2_fs.h:19:
../../lib/ext2fs/ext2_types.h:20:9: error: unknown type name 'uint8_t'
typedef __U8_TYPEDEF __u8;
        ^
../../lib/ext2fs/ext2_types.h:14:22: note: expanded from macro '__U8_TYPEDEF'
#define __U8_TYPEDEF uint8_t
                     ^
../../lib/ext2fs/ext2_types.h:32:9: error: unknown type name 'uint16_t'
typedef __U16_TYPEDEF __u16;
        ^
../../lib/ext2fs/ext2_types.h:15:23: note: expanded from macro '__U16_TYPEDEF'
#define __U16_TYPEDEF uint16_t
                      ^
../../lib/ext2fs/ext2_types.h:61:9: error: unknown type name 'uint32_t'
typedef __U32_TYPEDEF __u32;
        ^
../../lib/ext2fs/ext2_types.h:16:23: note: expanded from macro '__U32_TYPEDEF'
#define __U32_TYPEDEF uint32_t
                      ^
3 errors generated.
diff mbox

Patch

diff --git a/tools/e2fsprogs/patches/005-darwin-compat.patch b/tools/e2fsprogs/patches/005-darwin-compat.patch
new file mode 100644
index 0000000..8a1db91
--- /dev/null
+++ b/tools/e2fsprogs/patches/005-darwin-compat.patch
@@ -0,0 +1,26 @@ 
+--- a/lib/blkid/blkid_types.h.in
++++ b/lib/blkid/blkid_types.h.in
+@@ -9,6 +9,10 @@
+ 
+ @ASM_TYPES_HEADER@
+ 
++#if __APPLE__
++#include <stdint.h>
++#endif
++
+ #ifdef __U8_TYPEDEF
+ typedef __U8_TYPEDEF __u8;
+ #else
+--- a/lib/ext2fs/ext2_types.h.in
++++ b/lib/ext2fs/ext2_types.h.in
+@@ -9,6 +9,10 @@
+ 
+ @ASM_TYPES_HEADER@
+ 
++#if __APPLE__
++#include <stdint.h>
++#endif
++
+ #ifdef __U8_TYPEDEF
+ typedef __U8_TYPEDEF __u8;
+ #else