[libreoffice] 01/05: fix internal mysqlcppconn build
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 8525670d9d78709feba66f3f6936290e5e67a8d6
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 27 11:18:21 2015 +0200
fix internal mysqlcppconn build
---
changelog | 3 +++
patches/mysqlcppconn-libmysqlclient-SONAME.diff | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index c3427f3..117dec9 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
libreoffice (1:5.0.1~rc2-2) UNRELEASED; urgency=medium
+ * debian/patches/mysqlcppconn-libmysqlclient-SONAME.diff: update; fix internal
+ mysqlcppconn build
+
* debian/rules:
- two more s/src/tarballs/ I forgot
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index ed2de60..038b780 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -18,8 +18,8 @@ index 1670de8..c5bab4f 100644
+--- 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(__APPLE__)
-+ static const char * const baseName = "libmysqlclient_r.dylib";
++ #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;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: