external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 2 +- external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit 4276577763c5537949995990771f295159acb157 Author: Michael Stahl <[email protected]> AuthorDate: Tue Dec 1 20:05:32 2020 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Dec 2 15:41:21 2020 +0100 mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem plugins They were already compiled in some way. Change-Id: Ic1b8563a53bad5be03bce2c0d3d2cf841e303f02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107007 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107027 diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk index c811473e11ce..3458089ce99e 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -72,9 +72,9 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \ UnpackedTarball/mariadb-connector-c/libmariadb/secure/win_crypt \ UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv \ - , \ UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_npipe \ UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_shmem \ + , \ UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt \ ) \ )) diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk index b34c3490661c..241e12db6581 100644 --- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -36,11 +36,19 @@ $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \ extern struct st_mysql_client_plugin pvio_socket_client_plugin\; \ extern struct st_mysql_client_plugin caching_sha2_password_client_plugin\; \ extern struct st_mysql_client_plugin mysql_native_password_client_plugin\; \ + $(if $(filter WNT,$(OS)), \ + extern struct st_mysql_client_plugin pvio_shmem_client_plugin\; \ + extern struct st_mysql_client_plugin pvio_npipe_client_plugin\; \ + ) \ /' \ -e 's/@BUILTIN_PLUGINS@/ \ (struct st_mysql_client_plugin *)\&pvio_socket_client_plugin$(COMMA) \ (struct st_mysql_client_plugin *)\&caching_sha2_password_client_plugin$(COMMA) \ (struct st_mysql_client_plugin *)\&mysql_native_password_client_plugin$(COMMA) \ + $(if $(filter WNT,$(OS)), \ + (struct st_mysql_client_plugin *)\&pvio_shmem_client_plugin$(COMMA) \ + (struct st_mysql_client_plugin *)\&pvio_npipe_client_plugin$(COMMA) \ + ) \ /' \ > libmariadb/ma_client_plugin.c \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
