commit: cff8321fce2d9cab334c5dffaa9489fded567e99 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Aug 22 10:50:07 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Aug 22 10:50:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff8321f
net-analyzer/cacti-spine: Fix building against dev-db/mysql-connector-c-8* Fixes: https://bugs.gentoo.org/692656 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../{cacti-spine-1.2.5.ebuild => cacti-spine-1.2.5-r1.ebuild} | 1 + .../cacti-spine/files/cacti-spine-1.2.5-my_bool.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) 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 similarity index 95% rename from net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild rename to net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild index 9a49a508792..8da328d3acd 100644 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild @@ -30,6 +30,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.8.8d-ping.patch "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch + "${FILESDIR}"/${PN}-1.2.5-my_bool.patch ) src_prepare() { 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 new file mode 100644 index 00000000000..d9554bfa38c --- /dev/null +++ b/net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch @@ -0,0 +1,11 @@ +--- a/sql.c ++++ b/sql.c +@@ -229,7 +229,7 @@ void db_connect(int type, MYSQL *mysql) { + timeout = 5; + rtimeout = 10; + wtimeout = 20; +- my_bool reconnect = 1; ++ _Bool reconnect = 1; + + mysql_init(mysql); +
