1 |
commit: cff8321fce2d9cab334c5dffaa9489fded567e99 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 22 10:50:07 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 22 10:50:38 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff8321f |
7 |
|
8 |
net-analyzer/cacti-spine: Fix building against dev-db/mysql-connector-c-8* |
9 |
|
10 |
Fixes: https://bugs.gentoo.org/692656 |
11 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
.../{cacti-spine-1.2.5.ebuild => cacti-spine-1.2.5-r1.ebuild} | 1 + |
15 |
.../cacti-spine/files/cacti-spine-1.2.5-my_bool.patch | 11 +++++++++++ |
16 |
2 files changed, 12 insertions(+) |
17 |
|
18 |
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild |
19 |
similarity index 95% |
20 |
rename from net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild |
21 |
rename to net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild |
22 |
index 9a49a508792..8da328d3acd 100644 |
23 |
--- a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild |
24 |
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild |
25 |
@@ -30,6 +30,7 @@ RDEPEND=" |
26 |
PATCHES=( |
27 |
"${FILESDIR}"/${PN}-0.8.8d-ping.patch |
28 |
"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch |
29 |
+ "${FILESDIR}"/${PN}-1.2.5-my_bool.patch |
30 |
) |
31 |
|
32 |
src_prepare() { |
33 |
|
34 |
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch |
35 |
new file mode 100644 |
36 |
index 00000000000..d9554bfa38c |
37 |
--- /dev/null |
38 |
+++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch |
39 |
@@ -0,0 +1,11 @@ |
40 |
+--- a/sql.c |
41 |
++++ b/sql.c |
42 |
+@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) { |
43 |
+ timeout = 5; |
44 |
+ rtimeout = 10; |
45 |
+ wtimeout = 20; |
46 |
+- my_bool reconnect = 1; |
47 |
++ _Bool reconnect = 1; |
48 |
+ |
49 |
+ mysql_init(mysql); |
50 |
+ |