[Libreoffice-commits] core.git: 2 commits - download.lst external/mysqlcppconn mysqlc/README
Lionel Elie Mamane
lionel at mamane.lu
Mon Aug 11 06:48:29 PDT 2014
download.lst | 2
external/mysqlcppconn/Library_mysqlcppconn.mk | 8 +
external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1
external/mysqlcppconn/patches/default_to_protocol_tcp.patch | 12 --
mysqlc/README | 67 +++++++-----
5 files changed, 50 insertions(+), 40 deletions(-)
New commits:
commit 0816b00d06eceee3e601177bce1c61e367bbabee
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Aug 11 15:47:13 2014 +0200
update mysqlc README
Change-Id: I832c31d760d4cc0cb7fcb0c5dfef7b06010d7a3a
diff --git a/mysqlc/README b/mysqlc/README
index abc5b98..8d0968f 100644
--- a/mysqlc/README
+++ b/mysqlc/README
@@ -5,15 +5,17 @@ It ships as an extension (.oxt file).
== Requirements ==
The MySQL driver for LibreOffice (MySQL Connector/LibreOffice - C/LibO)
-requires two external libraries to be build:
+requires two external libraries to be built:
- 1) The MySQL Client Library (libmysql)
+ 1) The MySQL Client Library (libmysql) or MariaDB Client library
2) The MySQL Connector/C++ Library (libmysqlcppconn)
-libmysql is not included as an external and needs to be provided by
-the build environment, but libmysqlcppconn is provided as an external
-and will be automatically compiled if you pass
-"--without-system-mysql-cppconn" to autogen.sh.
+The MariaDB client library is provided as an external and will be
+automatically built if you pass "--without-system-mariadb" to
+autogens.sh.
+
+libmysqlcppconn is provided as an external and will be automatically
+compiled if you pass "--without-system-mysql-cppconn" to autogen.sh.
The MySQL driver for LibreOffice does not reimplement the MySQL
Client/Server communication protocol. The protocol implementation is
@@ -24,20 +26,24 @@ the C based MySQL Client Library.
== Variants ==
-If configured with --with-system-mysql, the driver will *not* ship a
-copy of the MySQL client C library and will expect it to be installed
-in a standard location on each system that it runs on. That is usually
-the right choice to create a native package/port for GNU/Linux, BSD,
-etc, where the packaging system handles dependencies and will ensure
-the availability of the MySQL client C library in the standard
-location.
-
-If configured with --with-libmysql-path, the driver will ship a copy
-of the MySQL client C library so that it works "out of the box" on any
-system. That is usually the right choice to create a stand-alone .oxt
-file that users can just install through the LibreOffice extensions
-manager, as is typical for Microsoft Windows and Apple MacOS X native
-(as opposed to MacPorts/fink/pkgsrc/...).
+If configured with --with-system-mariadb --disable-bundle-mariadb, the
+driver will *not* ship a copy of the MySQL client C library and will
+expect it to be installed in a standard location on each system that
+it runs on. That is usually the right choice to create a native
+package/port for GNU/Linux, BSD, etc, where the packaging system
+handles dependencies and will ensure the availability of the MySQL
+client C library in the standard location.
+
+If configured with--with-system-mariadb --enable-bundle-mariadb, the
+driver will ship a copy of the MariaDB (or MySQL) client C library so
+that it works "out of the box" on any system. That (or
+--without-system-mariadb) is usually the right choice to create a
+stand-alone .oxt file that users can just install through the
+LibreOffice extensions manager, as is typical for Microsoft Windows
+and Apple MacOS X native (as opposed to MacPorts / fink / pkgsrc /
+...).
+
+--disable-bundle-mariadb is the default.
== Installing the Requirements ==
@@ -45,16 +51,25 @@ On modern/free-as-in-free-speech Unices, libmysql and libmysqlcppconn
are probably available as a package/port. Install them using your
distribution's tools. Make sure to install the development packages
(whose name usually ends with -dev or -devel), and not only the
-libraries themselves. You can use --with-system-mysql or
---with-libmysql-path=/usr/ (but not both).
+libraries themselves.
-Else you can install the MySQL Client Library from official MySQL
-packages at http://dev.mysql.com/downloads/connector/c/ .
+Else you can install the MariaDB Client Library from official MariaDB
+packages at https://downloads.mariadb.org/client-native/ .
+At least series 2.0 is recommended, as series 1.0 are known to be too
+buggy.
They have source and binary distributions for several platforms.
+Alternativaly, MySQL Client Library from official MySQL
+packages are at http://dev.mysql.com/downloads/connector/c/ .
+
You can also install the MySQL Client Library (libmysql) as part of
-the MySQL Server, version 5.0 or later. Check the MySQL manual for
-instructions: http://dev.mysql.com/doc/refman/5.5/en/installing.html
+the MariaDB or MySQL Server, version 5.0 or later. Check the MariaDB
+or MySQL manual for instructions:
+https://mariadb.com/kb/en/mariadb/documentation/getting-started/getting-installing-and-upgrading-mariadb/
+http://dev.mysql.com/doc/refman/5.5/en/installing.html
The typical installation path of the libmysql.so on Unix is
/usr/local/mysql/lib/mysql/ .
+
+Official packages for libmysqlcppconn can be downloaded from
+http://dev.mysql.com/downloads/connector/cpp/
commit d9c2eb046c7827d7c1fcf78593a5b450d5ee68ab
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Aug 11 15:46:24 2014 +0200
update mysqlcppconn to latest version
Change-Id: I2e60d97b777727878daf811c2f3da697af69c484
diff --git a/download.lst b/download.lst
index 1708e1a..ac0682c 100644
--- a/download.lst
+++ b/download.lst
@@ -100,7 +100,7 @@ export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6
export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2
-export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
+export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
index eccc521..0bc28b6 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/mysql_resultset \
UnpackedTarball/mysqlcppconn/driver/mysql_resultset_metadata \
UnpackedTarball/mysqlcppconn/driver/mysql_statement \
+ UnpackedTarball/mysqlcppconn/driver/mysql_uri \
UnpackedTarball/mysqlcppconn/driver/mysql_util \
UnpackedTarball/mysqlcppconn/driver/mysql_warning \
UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_client_api \
@@ -73,4 +74,11 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
))
+$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: mysqlcppconn_configure
+
+mysqlcppconn_configure: $(call gb_UnpackedTarball_get_target,mysqlcppconn)
+ cd ../../workdir/GenCxxObject/UnpackedTarball/mysqlcppconn && cmake ../../../UnpackedTarball/mysqlcppconn/
+
+.PHONY: mysqlcppconn_configure
+
# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 9c2282e..74f19ac 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -17,7 +17,6 @@ $(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/default_to_protocol_tcp.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
))
diff --git a/external/mysqlcppconn/patches/default_to_protocol_tcp.patch b/external/mysqlcppconn/patches/default_to_protocol_tcp.patch
deleted file mode 100644
index 320d699..0000000
--- a/external/mysqlcppconn/patches/default_to_protocol_tcp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/mysql-connector-c++-1.1.0/driver/mysql_connection.cpp 2009-12-16 13:24:24.088933245 +0100
-+++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_connection.cpp 2009-12-16 13:24:15.666841004 +0100
-@@ -437,6 +437,9 @@
- }
- }
-
-+ int default_protocol_tcp = MYSQL_PROTOCOL_TCP;
-+ proxy->options(MYSQL_OPT_PROTOCOL, (const char *) &default_protocol_tcp);
-+
- #ifndef _WIN32
- if (!hostName.compare(0, sizeof("unix://") - 1, "unix://")) {
- protocol_tcp = false;
More information about the Libreoffice-commits
mailing list