diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/mysqlcppconn/Library_mysqlcppconn.mk (renamed from mysqlcppconn/Library_mysqlcppconn.mk) | 0 | ||||
| -rw-r--r-- | external/mysqlcppconn/Makefile (renamed from mysqlcppconn/Makefile) | 2 | ||||
| -rw-r--r-- | external/mysqlcppconn/Module_mysqlcppconn.mk (renamed from mysqlcppconn/Module_mysqlcppconn.mk) | 4 | ||||
| -rw-r--r-- | external/mysqlcppconn/README (renamed from mysqlcppconn/README) | 0 | ||||
| -rw-r--r-- | external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk (renamed from mysqlcppconn/UnpackedTarball_mysqlcppconn.mk) | 8 | ||||
| -rw-r--r-- | external/mysqlcppconn/binding_config.h (renamed from mysqlcppconn/binding_config.h) | 0 | ||||
| -rw-r--r-- | external/mysqlcppconn/config.h (renamed from mysqlcppconn/config.h) | 0 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/default_to_protocol_tcp.patch (renamed from mysqlcppconn/patches/default_to_protocol_tcp.patch) | 0 | ||||
| -rw-r--r-- | external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch (renamed from mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch) | 0 |
11 files changed, 6 insertions, 10 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 4164b9c0cfdf..e03523b9c1e0 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MOZ,moz) \ $(call gb_Helper_optional,MARIADBC,mysqlc) \ - $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ $(call gb_Helper_optional,MYTHES,mythes) \ $(call gb_Helper_optional,NEON,neon) \ $(call gb_Helper_optional,NLPSOLVER,nlpsolver) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 92727a457299..bb949c409411 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,MARIADB,libmariadb) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ + $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,VISIO,libvisio) \ diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk index adebc5b027bc..adebc5b027bc 100644 --- a/mysqlcppconn/Library_mysqlcppconn.mk +++ b/external/mysqlcppconn/Library_mysqlcppconn.mk diff --git a/mysqlcppconn/Makefile b/external/mysqlcppconn/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/mysqlcppconn/Makefile +++ b/external/mysqlcppconn/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/mysqlcppconn/Module_mysqlcppconn.mk b/external/mysqlcppconn/Module_mysqlcppconn.mk index 01acff03626c..6a45dd8d8eea 100644 --- a/mysqlcppconn/Module_mysqlcppconn.mk +++ b/external/mysqlcppconn/Module_mysqlcppconn.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,mysqlcppconn)) -ifeq ($(SYSTEM_MYSQL_CPPCONN),NO) - $(eval $(call gb_Module_add_targets,mysqlcppconn,\ UnpackedTarball_mysqlcppconn \ Library_mysqlcppconn \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/mysqlcppconn/README b/external/mysqlcppconn/README index fb6207857a4c..fb6207857a4c 100644 --- a/mysqlcppconn/README +++ b/external/mysqlcppconn/README diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 3f86236bea24..ae0f267af52c 100644 --- a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -11,13 +11,13 @@ $(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,mysqlcppconn/config.h)) +$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,external/mysqlcppconn/config.h)) -$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_config.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,\ - mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ - mysqlcppconn/patches/default_to_protocol_tcp.patch \ + external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ + external/mysqlcppconn/patches/default_to_protocol_tcp.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/mysqlcppconn/binding_config.h b/external/mysqlcppconn/binding_config.h index 23811e8965b3..23811e8965b3 100644 --- a/mysqlcppconn/binding_config.h +++ b/external/mysqlcppconn/binding_config.h diff --git a/mysqlcppconn/config.h b/external/mysqlcppconn/config.h index 7736c611f7be..7736c611f7be 100644 --- a/mysqlcppconn/config.h +++ b/external/mysqlcppconn/config.h diff --git a/mysqlcppconn/patches/default_to_protocol_tcp.patch b/external/mysqlcppconn/patches/default_to_protocol_tcp.patch index 320d699ed697..320d699ed697 100644 --- a/mysqlcppconn/patches/default_to_protocol_tcp.patch +++ b/external/mysqlcppconn/patches/default_to_protocol_tcp.patch diff --git a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch index c7fd21b58ba5..c7fd21b58ba5 100644 --- a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch +++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch |