1 |
commit: d5b46cff84ac72a3d067835d2e79bead32659c51 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 29 19:46:13 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jan 29 19:46:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d5b46cff |
7 |
|
8 |
dev-util/android-tools: add build patch |
9 |
|
10 |
.../files/android-tools-8.1.0_p1-build.patch | 30 ++++++++++++++++++++++ |
11 |
1 file changed, 30 insertions(+) |
12 |
|
13 |
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch |
14 |
new file mode 100644 |
15 |
index 0000000..f3d664e |
16 |
--- /dev/null |
17 |
+++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch |
18 |
@@ -0,0 +1,30 @@ |
19 |
+--- a/adb/sysdeps.h |
20 |
++++ b/adb/sysdeps.h |
21 |
+@@ -66,6 +66,11 @@ |
22 |
+ #endif |
23 |
+ #endif |
24 |
+ |
25 |
++#ifndef __clang__ |
26 |
++#define _Nonnull |
27 |
++#define _Nullable |
28 |
++#endif |
29 |
++ |
30 |
+ #ifdef _WIN32 |
31 |
+ |
32 |
+ // Clang-only nullability specifiers |
33 |
+--- a/libcutils/include/cutils/trace.h |
34 |
++++ b/libcutils/include/cutils/trace.h |
35 |
+@@ -18,7 +18,13 @@ |
36 |
+ #define _LIBS_CUTILS_TRACE_H |
37 |
+ |
38 |
+ #include <inttypes.h> |
39 |
++// https://gcc.gnu.org/PR60932 |
40 |
++#ifdef __cplusplus |
41 |
++#include <atomic> |
42 |
++using namespace std; |
43 |
++#else |
44 |
+ #include <stdatomic.h> |
45 |
++#endif |
46 |
+ #include <stdbool.h> |
47 |
+ #include <stdint.h> |
48 |
+ #include <stdio.h> |