summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-test/cmocka/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-11-08 20:25:25 -0800
committerKhem Raj <raj.khem@gmail.com>2020-11-09 13:41:02 -0800
commit1b825a6e58898ce18f8f73b0caf4e54c1407b9e1 (patch)
tree6eec7fbdc27399bf3f6c7a7e868742dfb3e8b611 /meta-oe/recipes-test/cmocka/files
parent294e945309e5cabfbb60c80f95063e3be9b46bc2 (diff)
downloadmeta-openembedded-1b825a6e58898ce18f8f73b0caf4e54c1407b9e1.tar.gz
cmocka: Fix buils with LTO
Update to latest on master Drop uintptr_t patch, its fixed upstream differently Package up the new library libproc_uptime.so needed by examples Add it to INSANE_SKIP for examples Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-test/cmocka/files')
-rw-r--r--meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch b/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch
deleted file mode 100644
index 8d3b73b63..000000000
--- a/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 25 Jul 2018 09:55:25 +0800
4Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error
5
6Fix build on qemumips64(el)
7
8taken 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 ^~~~~~~~~
14use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined
15
16Upstream-Status: Pending
17
18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
20
21Taken from [PATCH] samba: cmocka.h: fix musl libc conflicting types error
22https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-connectivity/samba?id=b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c
23
24Signed-off-by: Armin Kuster <akuster808@gmail.com>
25
26This fix is not in cmocka, so pending pending??
27
28
29Index: git/include/cmocka.h
30===================================================================
31--- git.orig/include/cmocka.h
32+++ git/include/cmocka.h
33@@ -116,7 +116,7 @@ typedef uintmax_t LargestIntegralType;
34 ((LargestIntegralType)(value))
35
36 /* Smallest integral type capable of holding a pointer. */
37-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
38+#if !defined(__DEFINED_uintptr_t)
39 # if defined(_WIN32)
40 /* WIN32 is an ILP32 platform */
41 typedef unsigned int uintptr_t;
42@@ -140,9 +140,8 @@ typedef uintmax_t LargestIntegralType;
43 # endif /* __WORDSIZE */
44 # endif /* _WIN32 */
45
46-# define _UINTPTR_T
47-# define _UINTPTR_T_DEFINED
48-#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
49+# define __DEFINED_uintptr_t
50+#endif /* !defined(__DEFINED_uintptr_t) */
51
52 /* Perform an unsigned cast to uintptr_t. */
53 #define cast_to_pointer_integral_type(value) \