diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-17 14:59:30 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-06-17 16:56:50 +0200 |
| commit | 82a1650683df7d5c1769dfd68a26a4d071f1a546 (patch) | |
| tree | 2c7ba086ddf5b4b9169073ffb26ae9b2daa23bca /external | |
| parent | a81d7c4e0379a021664f8f6c5e9032a47fcf61d6 (diff) | |
mariadb: the "pvio_socket" plugin turns out to be important
... otherwise can't connect to a TCP socket.
(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)
Change-Id: I2a1f2968321aae108bfef67f602f06efcf3affd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk | 1 | ||||
| -rw-r--r-- | external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk | 5 |
2 files changed, 5 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 d32eda7f71d1..b0c62e1b160e 100644 --- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk @@ -64,6 +64,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\ UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \ UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \ UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \ + UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \ $(if $(filter $(OS),WNT), \ UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \ UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \ diff --git a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk index cf0d2eb06cfa..3d8ca9295131 100644 --- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk +++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk @@ -31,7 +31,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\ # TODO are any "plugins" needed? $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \ - < libmariadb/ma_client_plugin.c.in sed -e 's/@EXTERNAL_PLUGINS@//' -e 's/@BUILTIN_PLUGINS@//' > libmariadb/ma_client_plugin.c \ + < libmariadb/ma_client_plugin.c.in sed \ + -e 's/@EXTERNAL_PLUGINS@/extern struct st_mysql_client_plugin pvio_socket_client_plugin;/' \ + -e 's/@BUILTIN_PLUGINS@/(struct st_mysql_client_plugin *)\&pvio_socket_client_plugin$(COMMA)/' \ + > libmariadb/ma_client_plugin.c \ )) |