summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-08-22 12:50:07 +0200
committerJeroen Roovers <jer@gentoo.org>2019-08-22 12:50:38 +0200
commitcff8321fce2d9cab334c5dffaa9489fded567e99 (patch)
tree1442b142a3d6adce98baac7f2a3c09e538db49a8 /net-analyzer/cacti-spine
parentx11-misc/xscreensaver: Rename ${A} (diff)
downloadgentoo-cff8321fce2d9cab334c5dffaa9489fded567e99.tar.gz
gentoo-cff8321fce2d9cab334c5dffaa9489fded567e99.tar.bz2
gentoo-cff8321fce2d9cab334c5dffaa9489fded567e99.zip
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@gentoo.org>
Diffstat (limited to 'net-analyzer/cacti-spine')
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.2.5-r1.ebuild (renamed from net-analyzer/cacti-spine/cacti-spine-1.2.5.ebuild)1
-rw-r--r--net-analyzer/cacti-spine/files/cacti-spine-1.2.5-my_bool.patch11
2 files changed, 12 insertions, 0 deletions
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
index 9a49a5087926..8da328d3acdd 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 000000000000..d9554bfa38c5
--- /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);
+