Package: poco
Version: 1.8.0.1-1
Followup-For: Bug #889625
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Control: retitle -1 Please fix support for MySQL

Hello,

Unfortunately, building against mariadb in distros that use MySQL as the
default has knock-on effects, because poco has reverse-dependencies that
depend on both poco and other mysql-using libraries.

The attached patch is better, fixing compatibility with current versions of
libmysqlclient.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru poco-1.8.0.1/debian/patches/MySQL-5.7-compatibility.patch 
poco-1.8.0.1/debian/patches/MySQL-5.7-compatibility.patch
--- poco-1.8.0.1/debian/patches/MySQL-5.7-compatibility.patch   1969-12-31 
16:00:00.000000000 -0800
+++ poco-1.8.0.1/debian/patches/MySQL-5.7-compatibility.patch   2018-02-09 
21:38:48.000000000 -0800
@@ -0,0 +1,17 @@
+Description: Find libmysqlclient instead of the obsolete libmysqlclient_r
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/889625
+
+Index: poco-1.8.0.1/cmake/FindMySQL.cmake
+===================================================================
+--- poco-1.8.0.1.orig/cmake/FindMySQL.cmake
++++ poco-1.8.0.1/cmake/FindMySQL.cmake
+@@ -45,7 +45,7 @@
+                                ${BINDIR32}/MySQL/lib
+                                $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
+ else (WIN32)
+-      find_library(MYSQL_LIB NAMES mysqlclient_r
++      find_library(MYSQL_LIB NAMES mysqlclient
+                                PATHS
+                                /usr/lib/mysql
+                                /usr/local/lib/mysql
diff -Nru poco-1.8.0.1/debian/patches/series poco-1.8.0.1/debian/patches/series
--- poco-1.8.0.1/debian/patches/series  2017-11-13 11:42:17.000000000 -0800
+++ poco-1.8.0.1/debian/patches/series  2018-02-09 21:33:32.000000000 -0800
@@ -5,3 +5,4 @@
 0006-fp-support-environments-without-hardware-floating-po.patch
 0007-Switch-FreeBSD-to-poll.patch
 0009-Link-against-dl-on-FreeBSD.patch
+MySQL-5.7-compatibility.patch

Reply via email to