[maintainer] Unbreak databases/mysqlcppapi after mysql41-* update
databases/mysqlcppapi is unable to detect mysql-4.1.4 and use new mysql_shutdown() api. Thus it is broken with mysql41-* after mysql41-* were updated to 4.1.4. I hope this fix can make it way to ports before the freeze. PR: ports/71348 Submitted by: Jie Gao <gaoj@cpsc.ucalgary.ca>
This commit is contained in:
parent
69c50ebf27
commit
3e8d8ca41e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=119143
3 changed files with 14 additions and 2 deletions
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= mysqlcppapi
|
||||
PORTVERSION= 1.9.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases devel
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR=mysqlcppapi
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- configure~ Wed Aug 4 23:58:41 2004
|
||||
--- configure.orig Wed Aug 4 23:58:41 2004
|
||||
+++ configure Thu Aug 5 00:12:29 2004
|
||||
@@ -18465,8 +18465,8 @@
|
||||
fi;
|
||||
|
@ -11,3 +11,14 @@
|
|||
|
||||
|
||||
|
||||
--- configure.orig Fri Aug 29 03:24:14 2003
|
||||
+++ configure Fri Sep 3 20:09:58 2004
|
||||
@@ -18660,7 +18660,7 @@
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lmysqlclient $LIBS"
|
||||
+LIBS="-L$MYSQL_PREFIX/lib/mysql -lmysqlclient $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
{
|
||||
check_connection_is_open();
|
||||
-
|
||||
+#if ( MYSQL_VERSION_ID == 40103 ) || ( MYSQL_VERSION_ID == 50001 )
|
||||
+#if ( MYSQL_VERSION_ID >= 50001 ) || (( MYSQL_VERSION_ID < 50000 ) && ( MYSQL_VERSION_ID >= 40103 ))
|
||||
+ bool suc = !(mysql_shutdown(m_sharedptr_connection.obj(),SHUTDOWN_DEFAULT));
|
||||
+#else
|
||||
bool suc = !(mysql_shutdown(m_sharedptr_connection.obj()));
|
||||
|
|
Loading…
Reference in a new issue