From: Debian LibreOffice Maintainers Date: Sat, 2 Dec 2017 00:01:41 +0000 (+0000) Subject: mysqlcppconn-libmysqlclient-SONAME X-Git-Tag: archive/raspbian/1%5.4.3-4+rpi1^2~24 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e61e216a88499bfdaa9ddc59b219c29c05043f4f;p=libreoffice.git mysqlcppconn-libmysqlclient-SONAME Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff --- diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk index e2894824bc1..c732243fe6f 100644 --- a/external/mysqlcppconn/Library_mysqlcppconn.mk +++ b/external/mysqlcppconn/Library_mysqlcppconn.mk @@ -84,4 +84,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \ )) +$(eval $(call gb_Library_add_cflags,mysqlcppconn,\ + -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e s/mysqlclient/mysqlclient_r/ | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient_r.so.[0-9][0-9]\).*,\\1,")\" \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 82a36846074..03d0a8b0505 100644 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ + external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch \ external/mysqlcppconn/patches/warnings.patch.0 \ external/mysqlcppconn/patches/enable-libmysql-proxy.patch \ external/mysqlcppconn/patches/dynexcspec.patch.0 \ diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch new file mode 100644 index 00000000000..5a0357b5707 --- /dev/null +++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch @@ -0,0 +1,12 @@ +diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp +--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200 ++++ misc/build/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 20:25:31.000000000 +0200 +@@ -26,7 +26,7 @@ + #elif defined(__hpux) && defined(__hppa) + static const char * const baseName = "libmysqlclient_r.sl"; + #else +-static const char * const baseName = "libmysqlclient_r.so"; ++static const char * const baseName = LIBMYSQLCLIENT_SONAME; + #endif + + template