[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/mariadb-connector-c

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Fri Oct 9 09:10:19 UTC 2020


 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2db12ad6f3bd5103bed80db9798b88d81f2b59e6
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Oct 6 21:04:59 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Oct 9 11:09:46 2020 +0200

    Related tdf#135202: declare libmariadb/secure/win_crypt in mk file for MariaDB
    
    Change-Id: Ib9634d9e88d7e97a5c03ff4d8b7808c598c3b8bf
    
    (cherry picked from commit cab3476aea0fc980951bf6e729879ecdc0d0e9b7)
    
    Change-Id: I3f434011c0b57abf82a721c5c83b4e4f25dc42fd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103985
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index b0c62e1b160e..89d4bfbe954e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -67,6 +67,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
 	UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
 	$(if $(filter $(OS),WNT), \
 		UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
+		UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt \
 		UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \
 ))
 


More information about the Libreoffice-commits mailing list