Makefile.fetch | 1
RepositoryExternal.mk | 37 ----
config_host.mk.in | 1
configure.ac | 46 -----
connectivity/Library_mysqlc.mk | 4
connectivity/source/drivers/mysqlc/mysqlc_connection.cxx | 1
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx | 1
distro-configs/Jenkins/Linux_ubsan_master.conf | 1
download.lst | 2
external/mysql-connector-cpp/Library_mysqlcppconn.mk | 87
----------
solenv/clang-format/blacklist | 3
11 files changed, 2 insertions(+), 182 deletions(-)
New commits:
commit 940ba554a4b7861bab20ab6e8db6bcf88a93e5a9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 27 13:36:06 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:53:01 2018 +0200
No space before period
...left there by 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc
into
connectivity as a library". (And remove latter half of sentence that
doesn't
make much sense anymore.)
Change-Id: Ic87bd243cfde61080e4afae14de5c3fe7c53824b
Reviewed-on: https://gerrit.libreoffice.org/59656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 760111784eb014091a445b3c5c2d1ad7b1b1ded7)
diff --git a/configure.ac b/configure.ac
index 87cc6f16b52b..9ed771bf868a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1638,8 +1638,7 @@ AC_ARG_WITH(system-apache-commons,
AC_ARG_WITH(system-mariadb,
AS_HELP_STRING([--with-system-mariadb],
- [Use MariaDB/MySQL libraries already on system, for building the
MariaDB Connector/LibreOffice
- .]),,
+ [Use MariaDB/MySQL libraries already on system.]),,
[with_system_mariadb="$with_system_libs"])
AC_ARG_ENABLE(bundle-mariadb,
commit 2803de7f376f25bd98ca6b064bc683ad420cf4d8
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 27 11:51:37 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:41:33 2018 +0200
coverity#1438784 Uninitialized pointer field
Change-Id: Ic8bc7423765f8610d92ca3ced4c52d4838b7699a
Reviewed-on: https://gerrit.libreoffice.org/59653
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 15f6a37f97acaa8ea8c5af208d2f16992f349df0)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index 74c68b2dbe11..e6149975be9c 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -64,6 +64,7 @@ void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql)
OConnection::OConnection(MysqlCDriver& _rDriver)
: OMetaConnection_BASE(m_aMutex)
+ , m_mysql()
, m_xMetaData(nullptr)
, m_xDriver(&_rDriver)
{
commit da67d877f83eaa3d3238471aa13204c3a2fcfd53
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 27 09:23:31 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:40:41 2018 +0200
--enable-ext-mariadb-connector was removed
...in 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 "Moving mysqlc into
connectivity
as a library", apparently without replacement
Change-Id: Ia1d32f98bd90efe2fcd4441dd84cd1862a4daa70
(cherry picked from commit b1d1edff4e81a8299e2a17c7e562d144329549ab)
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf
b/distro-configs/Jenkins/Linux_ubsan_master.conf
index 46338003d792..b459a8248db6 100644
--- a/distro-configs/Jenkins/Linux_ubsan_master.conf
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -7,7 +7,6 @@
--enable-evolution2
--enable-ext-ct2n
--enable-ext-languagetool
---enable-ext-mariadb-connector
--with-system-mariadb
--enable-ext-nlpsolver
--enable-ext-numbertext
commit 0ccafc71d5f5194b79c36ccb9e8e10f54b25a31b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Aug 27 08:53:09 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:40:12 2018 +0200
-Werror,-Wunused-private-field
Change-Id: I8c71fe9a5ae0d228313b6b66752ee93aae72f539
(cherry picked from commit 63f8c506637c910ed1efa572f23ff1af7715e7e3)
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
index 2ed4eca4179b..02e72f98c664 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
@@ -39,7 +39,6 @@ class ODatabaseMetaData final : public ODatabaseMetaData_BASE
{
OConnection& m_rConnection;
MYSQL* m_pMySql;
- rtl::OUString identifier_quote_string;
public:
const OConnection& getOwnConnection() const { return m_rConnection; }
commit 30e5503009ac0556d3f7929665896b1196f79cfa
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 26 14:55:45 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:39:31 2018 +0200
drop unnecessary SYSTEM_MYSQL_CONNECTOR_CPP
Change-Id: I41cfbf41247270d29e08e5125adc05aac198b175
Reviewed-on: https://gerrit.libreoffice.org/59608
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 5061663ce052087c6d5d0910d6f99358e26dbbd1)
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dfcd99963389..78b511a3f124 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -297,43 +297,6 @@ endef
endif
-ifneq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
-
-define gb_LinkTarget__use_mysql-connector-cpp
-$(call gb_LinkTarget_add_libs,$(1),\
- -lmysqlcppconn \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
- -DSYSTEM_MYSQL_CPPCONN \
-)
-endef
-
-else
-
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OXT,\
- mysqlcppconn \
-))
-
-# note: this does not link mysqlcppconn, it is loaded via
osl_loadModuleRelative
-define gb_LinkTarget__use_mysql-connector-cpp
-
-$(call gb_LinkTarget_use_unpacked,$(1),mysql-connector-cpp)
-
-$(call gb_LinkTarget_add_defs,$(1),\
- -DCPPCONN_LIB_BUILD \
-)
-
-$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \
- -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \
- $$(INCLUDE) \
-)
-
-endef
-
-endif
-
ifneq ($(SYSTEM_ZLIB),)
define gb_LinkTarget__use_zlib
diff --git a/config_host.mk.in b/config_host.mk.in
index e5fffdb72121..dcf044d4ea12 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -549,7 +549,6 @@ export SYSTEM_MDDS=@SYSTEM_MDDS@
export SYSTEM_MARIADB_CONNECTOR_C=@SYSTEM_MARIADB_CONNECTOR_C@
export SYSTEM_MSPUB=@SYSTEM_MSPUB@
export SYSTEM_MWAW=@SYSTEM_MWAW@
-export SYSTEM_MYSQL_CONNECTOR_CPP=@SYSTEM_MYSQL_CONNECTOR_CPP@
export SYSTEM_MYTHES=@SYSTEM_MYTHES@
export SYSTEM_NEON=@SYSTEM_NEON@
export SYSTEM_NSS=@SYSTEM_NSS@
diff --git a/configure.ac b/configure.ac
index 8d19fefed306..87cc6f16b52b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8214,49 +8214,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
AC_SUBST(LIBMARIADB)
AC_SUBST(LIBMARIADB_PATH)
AC_SUBST(BUNDLE_MARIADB_CONNECTOR_C)
-
- AC_LANG_PUSH([C++])
- dnl ===================================================================
- dnl Check for system MySQL C++ Connector
- dnl ===================================================================
- # FIXME!
- # who thought this too-generic cppconn dir was a good idea?
- AC_MSG_CHECKING([MySQL Connector/C++])
- if test "$with_system_mysql_cppconn" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_MYSQL_CONNECTOR_CPP=TRUE
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADER(mysql_driver.h, [],
- [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++
Connectivity)], [])
- AC_CHECK_LIB([mysqlcppconn], [main], [:],
- [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or
functional)], [])
- save_LIBS=$LIBS
- LIBS="$LIBS -lmysqlcppconn"
- AC_MSG_CHECKING([version])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <mysql_driver.h>
-
-int main(int argc, char **argv) {
- sql::Driver *driver;
- driver = get_driver_instance();
- if (driver->getMajorVersion() > 1 || \
- (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \
- (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 &&
driver->getPatchVersion() >= 6))
- return 0;
- else
- return 1;
-}
- ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >=
1.0.6])],[AC_MSG_ERROR([MySQL C++ Connecter not tested with
cross-compilation])])
-
- AC_LANG_POP([C++])
- LIBS=$save_LIBS
- else
- AC_MSG_RESULT([internal])
- SYSTEM_MYSQL_CONNECTOR_CPP=
- fi
- AC_LANG_POP([C++])
fi
-AC_SUBST(SYSTEM_MYSQL_CONNECTOR_CPP)
dnl ===================================================================
dnl Check for system hsqldb
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index bd705d2ee04b..26add5bee4cc 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -25,13 +25,11 @@ $(eval $(call gb_Library_set_include,mysqlc,\
-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
-ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
$(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz
-lm,\
-rdynamic -lz -lcrypt -lnsl -lm)) \
$(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
))
-endif
$(eval $(call gb_Library_use_sdk_api,mysqlc))
commit 552ed2dfdfa1a85ead25b2d654c03782412784d9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 26 14:50:02 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:39:07 2018 +0200
don't need dangling Library_mysqlcppconn.mk
Reviewed-on: https://gerrit.libreoffice.org/59607
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 74ef0185b1945d610c591b7ec3cda67e5c857d22)
Change-Id: I18fbe9feead3d48d9437cc7372eb1373ffb67c3e
diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk
b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
deleted file mode 100644
index 152aee8c0764..000000000000
--- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, you can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,mysqlcppconn))
-
-$(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysql-connector-cpp))
-
-$(eval $(call gb_Library_use_externals,mysqlcppconn, \
- boost_headers \
- mariadb-connector-c \
-))
-
-ifneq ($(OS),WNT)
-
-$(eval $(call gb_Library_add_libs,mysqlcppconn,\
- $(if $(filter-out MACOSX,$(OS)),-ldl) \
-))
-
-endif
-
-ifeq ($(OS),MACOSX)
-ifeq ($(SYSTEM_MARIADB_CONNECTOR_C),)
-$(eval $(call gb_Library_use_externals,mysqlcppconn,\
- iconv \
-))
-endif
-endif
-
-$(eval $(call gb_Library_set_external_code,mysqlcppconn))
-
-$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
-
-$(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp))
-
-$(eval $(call gb_Library_set_include,mysqlcppconn,\
- $$(INCLUDE) \
- -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \
- -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \
-))
-
-$(eval $(call gb_Library_add_defs,mysqlcppconn,\
- -Dmysqlcppconn_EXPORTS \
- $(if $(filter WNT,$(OS)),\
- -DCPPDBC_WIN32 \
- -D_CRT_SECURE_NO_WARNINGS \
- -D_SCL_SECURE_NO_WARNINGS ) \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,mysqlcppconn,\
- -lpthread \
-))
-endif
-
-$(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
- UnpackedTarball/mysql-connector-cpp/driver/mysql_art_resultset \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_art_rset_metadata \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_connection \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_debug \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_driver \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_metadata \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_parameter_metadata \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_prepared_statement \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset_metadata \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_resultbind \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset_metadata \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_statement \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_uri \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_util \
- UnpackedTarball/mysql-connector-cpp/driver/mysql_warning \
- UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_client_api \
- UnpackedTarball/mysql-connector-cpp/driver/nativeapi/library_loader \
-
UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_driver_wrapper
\
-
UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_connection_wrapper
\
-
UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_resultset_wrapper
\
-
UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_statement_wrapper
\
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index cd5cd51826d2..96c80f2da548 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -4667,9 +4667,6 @@ external/libpng/configs/pnglibconf.h
external/mariadb-connector-c/configs/linux_my_config.h
external/mariadb-connector-c/configs/mac_my_config.h
external/mariadb-connector-c/configs/mysql_version.h
-external/mysql-connector-cpp/binding_config.h
-external/mysql-connector-cpp/config.h
-external/mysql-connector-cpp/version_info.h
external/neon/configs/config.h
external/redland/raptor/raptor2.h
external/redland/raptor/raptor_config.h
commit f392bc8993461ad748d6465051b48e3c219bcf3d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 26 14:41:17 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:37:25 2018 +0200
MYSQL_CONNECTOR_CPP not built anymore
since...
commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
Date: Thu Aug 16 16:35:17 2018 +0200
Moving mysqlc into connectivity as a library
Additionally I erased the remains of the old mysql C++ connector.
Also update the code where the clang plugins were unhappy after moving
the mysqlc module.
Remove mysql-cpp-connector external.
so we don't need the source to it
Change-Id: I0436e9f5a9cce87d0294cf3163a97a19566df1f4
Reviewed-on: https://gerrit.libreoffice.org/59605
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 44f878924648c23f5332e8a759b8c419b88724e1)
diff --git a/Makefile.fetch b/Makefile.fetch
index 4bd75aaa02be..bfa697168000 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -187,7 +187,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
- $(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
$(call fetch_Optional,MYTHES,MYTHES_TARBALL) \
$(call fetch_Optional,NEON,NEON_TARBALL) \
$(call fetch_Optional,NSS,NSS_TARBALL) \
diff --git a/configure.ac b/configure.ac
index e865649034c0..8d19fefed306 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8252,7 +8252,6 @@ int main(int argc, char **argv) {
LIBS=$save_LIBS
else
AC_MSG_RESULT([internal])
- BUILD_TYPE="$BUILD_TYPE MYSQL_CONNECTOR_CPP"
SYSTEM_MYSQL_CONNECTOR_CPP=
fi
AC_LANG_POP([C++])
diff --git a/download.lst b/download.lst
index afec547166e9..fc849af70177 100644
--- a/download.lst
+++ b/download.lst
@@ -191,8 +191,6 @@ export MSPUB_TARBALL := libmspub-0.1.3.tar.xz
export MWAW_SHA256SUM :=
db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea
export MWAW_VERSION_MICRO := 13
export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
-export MYSQL_CONNECTOR_CPP_SHA256SUM :=
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
-export MYSQL_CONNECTOR_CPP_TARBALL :=
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
export MYTHES_SHA256SUM :=
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_SHA256SUM :=
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
commit 3737042d9a730ab642abf967e4089eeb3a76f94d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 26 14:30:38 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 28 20:37:10 2018 +0200
CPPCONN_LIB now unused
since
commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
Author: Tamas Bunth <tamas.bu...@collabora.co.uk>
Date: Thu Aug 16 16:35:17 2018 +0200
Moving mysqlc into connectivity as a library
Change-Id: Iafc4fb685d8f7b97f8be83dbf26945f9af976f1a
Reviewed-on: https://gerrit.libreoffice.org/59604
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 71cbeeee374a416c90df54ef1a0353e04a7ca668)
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index eb8a5e5230c7..bd705d2ee04b 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
- $(if $(SYSTEM_MYSQL_CONNECTOR_CPP),,\
- -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\")
\
$(if $(BUNDLE_MARIADB_CONNECTOR_C),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
