1 |
commit: 131011cbfcd351810e8cfe0350ddb17b2312f326 |
2 |
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> |
3 |
AuthorDate: Mon Jan 27 09:19:51 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 28 14:09:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131011cb |
7 |
|
8 |
net-libs/libsrtp: fix building with gcc-10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706608 |
11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
12 |
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> |
13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/14470 |
15 |
|
16 |
net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch | 26 +++++++++++++++++++++++ |
17 |
net-libs/libsrtp/libsrtp-2.2.0.ebuild | 7 ++++-- |
18 |
2 files changed, 31 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..771ae0f5144 |
23 |
--- /dev/null |
24 |
+++ b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch |
25 |
@@ -0,0 +1,26 @@ |
26 |
+diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c |
27 |
+index c0dfece..ec2fe6d 100644 |
28 |
+--- a/crypto/math/datatypes.c |
29 |
++++ b/crypto/math/datatypes.c |
30 |
+@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet) |
31 |
+ |
32 |
+ /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */ |
33 |
+ |
34 |
+-char bit_string[MAX_PRINT_STRING_LEN]; |
35 |
++static char bit_string[MAX_PRINT_STRING_LEN]; |
36 |
+ |
37 |
+ uint8_t srtp_nibble_to_hex_char(uint8_t nibble) |
38 |
+ { |
39 |
+diff --git a/test/util.c b/test/util.c |
40 |
+index eb203f4..04e149c 100644 |
41 |
+--- a/test/util.c |
42 |
++++ b/test/util.c |
43 |
+@@ -47,7 +47,7 @@ |
44 |
+ #include <string.h> |
45 |
+ #include <stdint.h> |
46 |
+ |
47 |
+-char bit_string[MAX_PRINT_STRING_LEN]; |
48 |
++static char bit_string[MAX_PRINT_STRING_LEN]; |
49 |
+ |
50 |
+ static inline int hex_char_to_nibble(uint8_t c) |
51 |
+ { |
52 |
|
53 |
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild |
54 |
index a6f4fc333d8..1ee4065fcb3 100644 |
55 |
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild |
56 |
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2019 Gentoo Authors |
59 |
+# Copyright 1999-2020 Gentoo Authors |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI=6 |
63 |
@@ -25,7 +25,10 @@ DEPEND="${RDEPEND}" |
64 |
|
65 |
DOCS=( CHANGES ) |
66 |
|
67 |
-PATCHES=( "${FILESDIR}/${P}-pcap-automagic-r0.patch" ) |
68 |
+PATCHES=( |
69 |
+ "${FILESDIR}/${P}-pcap-automagic-r0.patch" |
70 |
+ "${FILESDIR}/${P}-gcc-10.patch" |
71 |
+) |
72 |
|
73 |
src_prepare() { |
74 |
default |