diff options
-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 \ )) |