From f3e1454ae0d5a02f30c07088e6446014a0090d87 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 31 Aug 2018 11:45:39 +0100 Subject: [PATCH] mysqlcppconn-libmysqlclient-SONAME Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff --- external/mysql-connector-cpp/Library_mysqlcppconn.mk | 4 ++++ .../UnpackedTarball_mysql-connector-cpp.mk | 1 + .../patches/mysql-connector-c++-1.1.0-SONAME.patch | 12 ++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk b/external/mysql-connector-cpp/Library_mysqlcppconn.mk index 152aee8c076..8d85e4100d7 100644 --- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk +++ b/external/mysql-connector-cpp/Library_mysqlcppconn.mk @@ -84,4 +84,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\ UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_statement_wrapper \ )) +$(eval $(call gb_Library_add_cflags,mysql-connector-cpp,\ + -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/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk index be0e482d531..818730696be 100644 --- a/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk +++ b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,driver/nativeapi/b $(eval $(call gb_UnpackedTarball_add_patches,mysql-connector-cpp,\ external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch \ + external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch \ external/mysql-connector-cpp/patches/warnings.patch.0 \ external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch \ external/mysql-connector-cpp/patches/dynexcspec.patch.0 \ diff --git a/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch b/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch new file mode 100644 index 00000000000..5a0357b5707 --- /dev/null +++ b/external/mysql-connector-cpp/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 -- 2.30.2