diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2018-12-12 16:29:38 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-12-12 11:56:49 -0800 |
commit | b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c (patch) | |
tree | 6cbbf3a1a5d05845a6085942c3000d879e8ccb8b /meta-networking/recipes-connectivity/samba/samba | |
parent | 6230bda5e51d83e628227a7ada1b5d08353fa0d8 (diff) | |
download | meta-openembedded-b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c.tar.gz |
samba: fix build on qemumips64 with musl
There is the same issue as for libldb, the header has conflicting defs
for unitptr_t. Fix it as done for the other recipe.
Fix
/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t'
typedef unsigned int uintptr_t;
^~~~~~~~~
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch b/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch new file mode 100644 index 000000000..5c299d617 --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Wed, 25 Jul 2018 09:55:25 +0800 | ||
4 | Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error | ||
5 | |||
6 | Fix build on qemumips64(el) | ||
7 | |||
8 | taken from: | ||
9 | [PATCH] libldb: fix musl libc conflicting types error | ||
10 | |||
11 | /third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' | ||
12 | typedef unsigned int uintptr_t; | ||
13 | ^~~~~~~~~ | ||
14 | use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | |||
18 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
19 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | ||
20 | --- | ||
21 | third_party/cmocka/cmocka.h | 7 +++---- | ||
22 | 1 file changed, 3 insertions(+), 4 deletions(-) | ||
23 | |||
24 | diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h | ||
25 | index 4fd82a9..5443a08 100644 | ||
26 | --- a/third_party/cmocka/cmocka.h | ||
27 | +++ b/third_party/cmocka/cmocka.h | ||
28 | @@ -110,7 +110,7 @@ typedef uintmax_t LargestIntegralType; | ||
29 | ((LargestIntegralType)(value)) | ||
30 | |||
31 | /* Smallest integral type capable of holding a pointer. */ | ||
32 | -#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) | ||
33 | +#if !defined(__DEFINED_uintptr_t) | ||
34 | # if defined(_WIN32) | ||
35 | /* WIN32 is an ILP32 platform */ | ||
36 | typedef unsigned int uintptr_t; | ||
37 | @@ -134,9 +134,8 @@ typedef uintmax_t LargestIntegralType; | ||
38 | # endif /* __WORDSIZE */ | ||
39 | # endif /* _WIN32 */ | ||
40 | |||
41 | -# define _UINTPTR_T | ||
42 | -# define _UINTPTR_T_DEFINED | ||
43 | -#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ | ||
44 | +# define __DEFINED_uintptr_t | ||
45 | +#endif /* !defined(__DEFINED_uintptr_t) */ | ||
46 | |||
47 | /* Perform an unsigned cast to uintptr_t. */ | ||
48 | #define cast_to_pointer_integral_type(value) \ | ||
49 | -- | ||
50 | 2.7.4 | ||
51 | |||