cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop referencing my_thread_init to unbreak build with recent mariadb releases

Browse Source 
The code was already using mysql_thread_init() at runtime with
mysql>=4.0, this diff only removes references to an obsolete function.

ok sthen@
This commit is contained in:
jca 2019-05-10 21:13:28 +00:00
parent ac3531dc9b
commit 500b81b3fc
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/rtg/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.16 2017/05/15 19:56:03 rsadowski Exp $
# $OpenBSD: Makefile,v 1.17 2019/05/10 21:13:28 jca Exp $
COMMENT = SNMP statistics monitoring system
DISTNAME = rtg-0.7.4
REVISION = 12
REVISION = 13
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=rtg/}

16
net/rtg/patches/patch-configure_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2008/07/19 13:52:22 sthen Exp $
--- configure.in.orig Thu Sep 25 16:20:19 2003
+++ configure.in Tue Jul 8 16:19:15 2008
$OpenBSD: patch-configure_in,v 1.2 2019/05/10 21:13:28 jca Exp $
Index: configure.in
--- configure.in.orig
+++ configure.in
@@ -14,9 +14,9 @@ AC_PREFIX_DEFAULT(/usr/local/rtg)
dnl Define auxiliary libraries
@ -14,6 +15,15 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2008/07/19 13:52:22 sthen Exp $
dnl Compilation Setup
AC_ARG_WITH(mysql,
@@ -143,7 +143,7 @@ fi
LDFLAGS="-L$MYSQL_LIB_DIR $LDFLAGS"
CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
-AC_CHECK_LIB(mysqlclient_r, my_thread_init,
+AC_CHECK_LIB(mysqlclient_r, mysql_thread_init,
LIBS="-lmysqlclient_r $LIBS",
AC_MSG_ERROR(Cannot link with thread-safe MySQL lib (libmysqlclient_r)))
@@ -221,6 +221,14 @@ if test "$OLD_UCD_SNMP" = "yes"; then
AC_MSG_ERROR(Cannot find UCD-SNMP libraries(snmp)))
fi

17
net/rtg/patches/patch-src_rtgsnmp_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_rtgsnmp_c,v 1.1 2019/05/10 21:13:28 jca Exp $
Index: src/rtgsnmp.c
--- src/rtgsnmp.c.orig
+++ src/rtgsnmp.c
@@ -46,10 +46,7 @@ void *poller(void *thread_args)
if (set.verbose >= HIGH)
printf("Thread [%d] starting.\n", worker->index);
- if (MYSQL_VERSION_ID > 40000)
- mysql_thread_init();
- else
- my_thread_init();
+ mysql_thread_init();
while (1) {
if (set.verbose >= DEVELOP)