[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - external/mariadb-connector-c Repository.mk

[Libreoffice Gerrit user]

 Repository.mk                                                     |    1 -
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |    8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0f31ccc4c3c5548ed1f9f133228936bea1155da2
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Aug 28 23:40:36 2018 -0700
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Aug 29 02:08:31 2018 -0700

    Remove numbertext from Repository.mk (mismerge)
    
    Change-Id: I9b100187e64b05ee087669b44e3e3e4f2b42f7e5

diff --git a/Repository.mk b/Repository.mk
index 415b10b78ed3..5cfe4a115f91 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -390,7 +390,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(call gb_Helper_optional,SCRIPTING,msforms) \
 	mtfrenderer \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
-	numbertext \
 	odbc \
 	odfflatxml \
 	offacc \
commit 12aeb21638de108d8207ff7c5d796ea4d0d49965
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Wed May 30 12:07:46 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Aug 29 02:08:31 2018 -0700

    mariadb-connector-c: fix Windows build
    
    --enable-ext-mariadb-connector is not the default, this fixes the build
    after using that switch up to the mariadb-connector-c module.
    mysql-connector-cpp is still broken, VS 2015 gives internal compiler
    error there for the used boost pieces...
    
    Change-Id: I1845cde03d5166594aac67c23e61186920ab3785
    Reviewed-on: https://gerrit.libreoffice.org/55055
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 46ac3e24f65ee69154afa6ba93997635629f79c0)

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 38803b594a1a..78641c53d27e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -25,6 +25,14 @@ $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
 ## (but then need to add "-lssl -lcrypto -lz" to mysqlcppconn linking)
 $(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED -DHAVE_STRTOULL))
+$(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
+	$$(INCLUDE) \
+	-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
+))
+endif
+
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
 	UnpackedTarball/mariadb-connector-c/libmariadb/array \
 	UnpackedTarball/mariadb-connector-c/libmariadb/ma_dyncol \