-
Notifications
You must be signed in to change notification settings - Fork 0
/
0001-android-patches.patch
133 lines (121 loc) · 4.28 KB
/
0001-android-patches.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
diff --git c/configure.ac i/configure.ac
index 5851413cf..3a86eb0a8 100644
--- c/configure.ac
+++ i/configure.ac
@@ -726,6 +726,10 @@ fi
AC_CHECK_HEADERS([endian.h sys/endian.h byteswap.h stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h sys/select.h sys/prctl.h])
+AC_CHECK_DECLS([getifaddrs, freeifaddrs],,,
+ [#include <sys/types.h>
+ #include <ifaddrs.h>]
+)
AC_CHECK_DECLS([strnlen])
# Check for daemon(3), unrelated to --with-daemon (although used by it)
diff --git c/depends/hosts/default.mk i/depends/hosts/default.mk
index 144e5f88b..4d444df7d 100644
--- c/depends/hosts/default.mk
+++ i/depends/hosts/default.mk
@@ -2,8 +2,8 @@ ifneq ($(host),$(build))
host_toolchain:=$(host)-
endif
-default_host_CC = $(host_toolchain)gcc
-default_host_CXX = $(host_toolchain)g++
+default_host_CC = $(host_toolchain)clang
+default_host_CXX = $(host_toolchain)clang++
default_host_AR = $(host_toolchain)ar
default_host_RANLIB = $(host_toolchain)ranlib
default_host_STRIP = $(host_toolchain)strip
diff --git c/depends/hosts/linux.mk i/depends/hosts/linux.mk
index b13a0f1ad..838db8537 100644
--- c/depends/hosts/linux.mk
+++ i/depends/hosts/linux.mk
@@ -10,19 +10,19 @@ linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
ifeq (86,$(findstring 86,$(build_arch)))
-i686_linux_CC=gcc -m32
-i686_linux_CXX=g++ -m32
-i686_linux_AR=ar
-i686_linux_RANLIB=ranlib
-i686_linux_NM=nm
-i686_linux_STRIP=strip
+i686_linux_CC=$(default_host_CC) -m32
+i686_linux_CXX=$(default_host_CXX) -m32
+i686_linux_AR=$(default_host_AR)
+i686_linux_RANLIB=$(default_host_RANLIB)
+i686_linux_NM=$(default_host_NM)
+i686_linux_STRIP=$(default_host_STRIP)
-x86_64_linux_CC=gcc -m64
-x86_64_linux_CXX=g++ -m64
-x86_64_linux_AR=ar
-x86_64_linux_RANLIB=ranlib
-x86_64_linux_NM=nm
-x86_64_linux_STRIP=strip
+x86_64_linux_CC=$(default_host_CC) -m64
+x86_64_linux_CXX=$(default_host_CXX) -m64
+x86_64_linux_AR=$(default_host_AR)
+x86_64_linux_RANLIB=$(default_host_RANLIB)
+x86_64_linux_NM=$(default_host_NM)
+x86_64_linux_STRIP=$(default_host_STRIP)
else
i686_linux_CC=$(default_host_CC) -m32
i686_linux_CXX=$(default_host_CXX) -m32
diff --git c/depends/packages/libevent.mk i/depends/packages/libevent.mk
index 5f622f8e6..40daeb60f 100644
--- c/depends/packages/libevent.mk
+++ i/depends/packages/libevent.mk
@@ -5,7 +5,7 @@ $(package)_file_name=release-$($(package)_version).tar.gz
$(package)_sha256_hash=316ddb401745ac5d222d7c529ef1eada12f58f6376a66c1118eee803cb70f83d
define $(package)_preprocess_cmds
- ./autogen.sh
+ ./autogen.sh && patch -p1 < /repo/0001-fixup.patch
endef
define $(package)_set_vars
diff --git c/src/net.cpp i/src/net.cpp
index 34dc4aec5..05cf75baa 100644
--- c/src/net.cpp
+++ i/src/net.cpp
@@ -2157,7 +2157,7 @@ void Discover()
}
}
}
-#else
+#elif (HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS)
// Get local host ip
struct ifaddrs* myaddrs;
if (getifaddrs(&myaddrs) == 0)
diff --git a/src/leveldb/util/env_posix.cc b/src/leveldb/util/env_posix.cc
index dd852af35..79f50204f 100644
--- a/src/leveldb/util/env_posix.cc
+++ b/src/leveldb/util/env_posix.cc
@@ -102,7 +102,7 @@ class PosixSequentialFile: public SequentialFile {
virtual Status Read(size_t n, Slice* result, char* scratch) {
Status s;
- size_t r = fread_unlocked(scratch, 1, n, file_);
+ size_t r = fread(scratch, 1, n, file_);
*result = Slice(scratch, r);
if (r < n) {
if (feof(file_)) {
@@ -225,7 +225,7 @@ class PosixWritableFile : public WritableFile {
}
virtual Status Append(const Slice& data) {
- size_t r = fwrite_unlocked(data.data(), 1, data.size(), file_);
+ size_t r = fwrite(data.data(), 1, data.size(), file_);
if (r != data.size()) {
return IOError(filename_, errno);
}
@@ -242,7 +242,7 @@ class PosixWritableFile : public WritableFile {
}
virtual Status Flush() {
- if (fflush_unlocked(file_) != 0) {
+ if (fflush(file_) != 0) {
return IOError(filename_, errno);
}
return Status::OK();
@@ -281,7 +281,7 @@ class PosixWritableFile : public WritableFile {
if (!s.ok()) {
return s;
}
- if (fflush_unlocked(file_) != 0 ||
+ if (fflush(file_) != 0 ||
fdatasync(fileno(file_)) != 0) {
s = Status::IOError(filename_, strerror(errno));
}