1 |
commit: 2847306d107bc3dc5df5981de5295a24bd258bc0 |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 1 02:36:55 2020 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 1 02:37:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2847306d |
7 |
|
8 |
net-proxy/shadowsocks-libev: fix gcc10 compiling error |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708380 |
11 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
12 |
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> |
13 |
|
14 |
.../files/shadowsocks-libev-3.3.4-gcc10.patch | 24 ++++++++++++++++++++++ |
15 |
.../shadowsocks-libev-3.3.4.ebuild | 3 +++ |
16 |
2 files changed, 27 insertions(+) |
17 |
|
18 |
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..7a480f12b24 |
21 |
--- /dev/null |
22 |
+++ b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-3.3.4-gcc10.patch |
23 |
@@ -0,0 +1,24 @@ |
24 |
+diff --git a/src/http.h b/src/http.h |
25 |
+index 914815a..e312dd3 100644 |
26 |
+--- a/src/http.h |
27 |
++++ b/src/http.h |
28 |
+@@ -29,6 +29,6 @@ |
29 |
+ #include <stdio.h> |
30 |
+ #include "protocol.h" |
31 |
+ |
32 |
+-const protocol_t *const http_protocol; |
33 |
++extern const protocol_t *const http_protocol; |
34 |
+ |
35 |
+ #endif |
36 |
+diff --git a/src/tls.h b/src/tls.h |
37 |
+index 3998913..ddbee11 100644 |
38 |
+--- a/src/tls.h |
39 |
++++ b/src/tls.h |
40 |
+@@ -28,6 +28,6 @@ |
41 |
+ |
42 |
+ #include "protocol.h" |
43 |
+ |
44 |
+-const protocol_t *const tls_protocol; |
45 |
++extern const protocol_t *const tls_protocol; |
46 |
+ |
47 |
+ #endif |
48 |
|
49 |
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild |
50 |
index be40495a1c0..353791fc263 100644 |
51 |
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild |
52 |
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild |
53 |
@@ -36,6 +36,9 @@ DEPEND="${RDEPEND} |
54 |
) |
55 |
" |
56 |
|
57 |
+PATCHES=( |
58 |
+ "${FILESDIR}/${P}-gcc10.patch" |
59 |
+) |
60 |
src_prepare() { |
61 |
sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \ |
62 |
configure.ac || die |