diff options
22 files changed, 135 insertions, 135 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index e0bff2616b99..79afddc3058b 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -181,7 +181,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ - $(call fetch_Optional,MYSQLCPPCONN,MYSQLCPPCONN_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/RepositoryExternal.mk b/RepositoryExternal.mk index 55508304f8d1..b1642dea4ca6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -288,9 +288,9 @@ endef endif -ifneq ($(SYSTEM_MYSQL_CPPCONN),) +ifneq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) -define gb_LinkTarget__use_mysqlcppconn +define gb_LinkTarget__use_mysql-connector-cpp $(call gb_LinkTarget_add_libs,$(1),\ -lmysqlcppconn \ ) @@ -307,17 +307,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OXT,\ )) # note: this does not link mysqlcppconn, it is loaded via osl_loadModuleRelative -define gb_LinkTarget__use_mysqlcppconn +define gb_LinkTarget__use_mysql-connector-cpp -$(call gb_LinkTarget_use_unpacked,$(1),mysqlcppconn) +$(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,mysqlcppconn) \ - -I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \ + -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \ + -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \ $$(INCLUDE) \ ) diff --git a/config_host.mk.in b/config_host.mk.in index e0a8a1833cb2..1b6361d24e1f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -542,7 +542,7 @@ 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_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ +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 4c84aa0a008e..00fc1aee1b0d 100644 --- a/configure.ac +++ b/configure.ac @@ -8243,7 +8243,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then AC_MSG_CHECKING([MySQL Connector/C++]) if test "$with_system_mysql_cppconn" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_MYSQL_CPPCONN=TRUE + 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)], []) @@ -8271,12 +8271,12 @@ int main(int argc, char **argv) { LIBS=$save_LIBS else AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN" - SYSTEM_MYSQL_CPPCONN= + BUILD_TYPE="$BUILD_TYPE MYSQL_CONNECTOR_CPP" + SYSTEM_MYSQL_CONNECTOR_CPP= fi AC_LANG_POP([C++]) fi -AC_SUBST(SYSTEM_MYSQL_CPPCONN) +AC_SUBST(SYSTEM_MYSQL_CONNECTOR_CPP) dnl =================================================================== dnl Check for system hsqldb diff --git a/download.lst b/download.lst index 679a97ab30eb..864e8155714c 100644 --- a/download.lst +++ b/download.lst @@ -160,8 +160,8 @@ export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 export MWAW_SHA256SUM := 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 export MWAW_VERSION_MICRO := 12 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz -export MYSQLCPPCONN_SHA256SUM := a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 -export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz +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 := 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd diff --git a/external/Module_external.mk b/external/Module_external.mk index de79fb2f7d56..590e216b3c2b 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -73,7 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ - $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ + $(call gb_Helper_optional,MYSQL_CONNECTOR_CPP,mysql-connector-cpp) \ $(call gb_Helper_optional,MYTHES,mythes) \ $(call gb_Helper_optional,NEON,neon) \ $(call gb_Helper_optional,NSS,nss) \ diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk b/external/mysql-connector-cpp/Library_mysqlcppconn.mk new file mode 100644 index 000000000000..152aee8c0764 --- /dev/null +++ b/external/mysql-connector-cpp/Library_mysqlcppconn.mk @@ -0,0 +1,87 @@ +# -*- 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/external/mysqlcppconn/Makefile b/external/mysql-connector-cpp/Makefile index e4968cf85fb6..e4968cf85fb6 100644 --- a/external/mysqlcppconn/Makefile +++ b/external/mysql-connector-cpp/Makefile diff --git a/external/mysqlcppconn/Module_mysqlcppconn.mk b/external/mysql-connector-cpp/Module_mysql-connector-cpp.mk index 6a45dd8d8eea..59e6229166bd 100644 --- a/external/mysqlcppconn/Module_mysqlcppconn.mk +++ b/external/mysql-connector-cpp/Module_mysql-connector-cpp.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Module_Module,mysqlcppconn)) +$(eval $(call gb_Module_Module,mysql-connector-cpp)) -$(eval $(call gb_Module_add_targets,mysqlcppconn,\ - UnpackedTarball_mysqlcppconn \ +$(eval $(call gb_Module_add_targets,mysql-connector-cpp,\ + UnpackedTarball_mysql-connector-cpp \ Library_mysqlcppconn \ )) diff --git a/external/mysqlcppconn/README b/external/mysql-connector-cpp/README index b49803dadfdb..b49803dadfdb 100644 --- a/external/mysqlcppconn/README +++ b/external/mysql-connector-cpp/README diff --git a/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk new file mode 100644 index 000000000000..be0e482d5315 --- /dev/null +++ b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk @@ -0,0 +1,26 @@ +# -*- 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_UnpackedTarball_UnpackedTarball,mysql-connector-cpp)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mysql-connector-cpp,$(MYSQL_CONNECTOR_CPP_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,cppconn/config.h,external/mysql-connector-cpp/config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,version_info.h,external/mysql-connector-cpp/version_info.h)) + +$(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,driver/nativeapi/binding_config.h,external/mysql-connector-cpp/binding_config.h)) + +$(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/warnings.patch.0 \ + external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch \ + external/mysql-connector-cpp/patches/dynexcspec.patch.0 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/binding_config.h b/external/mysql-connector-cpp/binding_config.h index 23811e8965b3..23811e8965b3 100644 --- a/external/mysqlcppconn/binding_config.h +++ b/external/mysql-connector-cpp/binding_config.h diff --git a/external/mysqlcppconn/config.h b/external/mysql-connector-cpp/config.h index eaa929437182..eaa929437182 100644 --- a/external/mysqlcppconn/config.h +++ b/external/mysql-connector-cpp/config.h diff --git a/external/mysqlcppconn/patches/dynexcspec.patch.0 b/external/mysql-connector-cpp/patches/dynexcspec.patch.0 index ed7ac3685a4b..ed7ac3685a4b 100644 --- a/external/mysqlcppconn/patches/dynexcspec.patch.0 +++ b/external/mysql-connector-cpp/patches/dynexcspec.patch.0 diff --git a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch b/external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch index 6a5894cb1e9c..6a5894cb1e9c 100644 --- a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch +++ b/external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch index ec439d2dfd56..ec439d2dfd56 100644 --- a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch +++ b/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch diff --git a/external/mysqlcppconn/patches/warnings.patch.0 b/external/mysql-connector-cpp/patches/warnings.patch.0 index 2cda42d86398..2cda42d86398 100644 --- a/external/mysqlcppconn/patches/warnings.patch.0 +++ b/external/mysql-connector-cpp/patches/warnings.patch.0 diff --git a/external/mysqlcppconn/version_info.h b/external/mysql-connector-cpp/version_info.h index a0203da33864..a0203da33864 100644 --- a/external/mysqlcppconn/version_info.h +++ b/external/mysql-connector-cpp/version_info.h diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk deleted file mode 100644 index 2b37b8de6bc7..000000000000 --- a/external/mysqlcppconn/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,mysqlcppconn)) - -$(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,mysqlcppconn) \ - -I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/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/mysqlcppconn/driver/mysql_art_resultset \ - UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \ - UnpackedTarball/mysqlcppconn/driver/mysql_connection \ - UnpackedTarball/mysqlcppconn/driver/mysql_debug \ - UnpackedTarball/mysqlcppconn/driver/mysql_driver \ - UnpackedTarball/mysqlcppconn/driver/mysql_metadata \ - UnpackedTarball/mysqlcppconn/driver/mysql_parameter_metadata \ - UnpackedTarball/mysqlcppconn/driver/mysql_prepared_statement \ - UnpackedTarball/mysqlcppconn/driver/mysql_ps_resultset \ - UnpackedTarball/mysqlcppconn/driver/mysql_ps_resultset_metadata \ - UnpackedTarball/mysqlcppconn/driver/mysql_resultbind \ - 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 \ - UnpackedTarball/mysqlcppconn/driver/nativeapi/library_loader \ - UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_driver_wrapper \ - UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_connection_wrapper \ - UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_resultset_wrapper \ - UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk deleted file mode 100644 index 82a368460747..000000000000 --- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ /dev/null @@ -1,26 +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_UnpackedTarball_UnpackedTarball,mysqlcppconn)) - -$(eval $(call gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL))) - -$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,external/mysqlcppconn/config.h)) -$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,version_info.h,external/mysqlcppconn/version_info.h)) - -$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,external/mysqlcppconn/binding_config.h)) - -$(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ - external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ - external/mysqlcppconn/patches/warnings.patch.0 \ - external/mysqlcppconn/patches/enable-libmysql-proxy.patch \ - external/mysqlcppconn/patches/dynexcspec.patch.0 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index 1cb6fcf2337e..6cdf44967c6b 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\ $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \ )) -ifeq ($(SYSTEM_MYSQL_CPPCONN),) +ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index 0cccc57c7380..8eb207d4bd9e 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -11,10 +11,10 @@ $(eval $(call gb_Library_Library,mysqlc)) $(eval $(call gb_Library_use_externals,mysqlc,\ boost_headers \ - mysqlcppconn \ + mysql-connector-cpp \ )) -ifeq ($(SYSTEM_MYSQL_CPPCONN),) +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)) \ @@ -36,7 +36,7 @@ $(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_CPPCONN),,\ + $(if $(SYSTEM_MYSQL_CONNECTOR_CPP),,\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ $(if $(BUNDLE_MARIADB_CONNECTOR_C),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ )) |