aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2020-11-13 19:00:53 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2020-12-03 12:59:22 +0100
commitad56bdd3a2724cc3862a62d1b040319c99c14d7a (patch)
tree8c6f4c2c3062f727922bb323aa7e53c7568ffe8e
parent309c93686644d880c2d434e89049ded8cff033f9 (diff)
tdf#135202: Mysql declare more plugins for native password
Add pvio_npipe + pvio_shmem + dialog Change-Id: I48d828e5cdf8d269aef3a40d75235a9519af8dc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105804 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 51a7985f539b7760c22b19521ed2bf5c2df4b1c1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106235 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5de977a4ca344c4c3f288951504f58937fe64124)
-rw-r--r--external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 768a43794432..664d58b03e5e 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/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+ UnpackedTarball/mariadb-connector-c/plugins/auth/dialog \
UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw \
UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
@@ -74,6 +75,8 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
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 \
) \
))