diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-12-01 20:05:32 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2020-12-03 12:59:22 +0100 |
| commit | bde8fcaee1011eea12f76fe71cfee8bacdc54dd7 (patch) | |
| tree | 7f90acc4df3925ac982c96bbef4f33dc21ba8d8f | |
| parent | 72dd2553d56279951a99599a2de59c763fe8881d (diff) | |
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 <michael.stahl@cib.de>
(cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a)
| -rw-r--r-- | external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 2 | ||||
| -rw-r--r-- | external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk index a93e353afaa0..3a7647b937ed 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -73,9 +73,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 \ )) |