diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-11-05 18:22:08 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2020-12-03 12:59:22 +0100 |
| commit | 309c93686644d880c2d434e89049ded8cff033f9 (patch) | |
| tree | 5423642eb3202840c5dd9ba9c301e2f90c95bca0 /connectivity | |
| parent | Related tdf#122560 tdf#135202: build plugin caching_sha2_pw for MariaDb/Mysql (diff) | |
| download | core-309c93686644d880c2d434e89049ded8cff033f9.tar.gz core-309c93686644d880c2d434e89049ded8cff033f9.zip | |
tdf#135202: Mysql use openssl libs to be able to use caching_sha2_pw
Change-Id: I7552b65022b725c6e87fef61478dc6e9c4322559
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105376
(cherry picked from commit 8c9b8c5970a08c2ef0ccddb7a691f3731d39175a)
mariadb-connector-c: fix makefile for GNU make 3.82
Old make thinks that ; terminates the recipe, have to escape it.
(other changes are just cosmetic)
(regression from 8c9b8c5970a08c2ef0ccddb7a691f3731d39175a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105516
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit ed564a411beb13a75a8f06d7cd040acad3e93dcb)
Change-Id: Ifd86ef3f17257139a078d23cb5471b9599ab6556
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 482e5f8c2d2979b5d6c3b58194b8e37e7df7480e)
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/Library_mysqlc.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk index 0999b46d3eec..f765fb1e305f 100644 --- a/connectivity/Library_mysqlc.mk +++ b/connectivity/Library_mysqlc.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,mysqlc)) $(eval $(call gb_Library_use_externals,mysqlc,\ boost_headers \ mariadb-connector-c \ + openssl \ )) $(eval $(call gb_Library_set_include,mysqlc,\ |