summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2024-03-26 19:23:20 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2024-03-26 20:20:32 +0300
commitf8dc0837b9bd87d7b0322c21a6baf3b10d325142 (patch)
tree12939a459aff78cc0512cad7ab24b66ffa6dcb18
parent7e3c47f72d4f3a3477184d84cc6bf76a2d95924c (diff)
Release version 8.0.15+15HEADv8.0.15+15master
Link libcrypto to mysql utility statically.
-rw-r--r--libmysqlclient/manifest2
-rw-r--r--mysql-client/manifest2
-rw-r--r--mysql-client/mysql/buildfile5
3 files changed, 5 insertions, 4 deletions
diff --git a/libmysqlclient/manifest b/libmysqlclient/manifest
index 5450a2a..e3ed48f 100644
--- a/libmysqlclient/manifest
+++ b/libmysqlclient/manifest
@@ -3,7 +3,7 @@ name: libmysqlclient
# Note: remember to update doc-url below!
#
-version: 8.0.15+14
+version: 8.0.15+15
project: mysql
summary: MySQL C API client library
diff --git a/mysql-client/manifest b/mysql-client/manifest
index 01a1452..a9fc220 100644
--- a/mysql-client/manifest
+++ b/mysql-client/manifest
@@ -3,7 +3,7 @@ name: mysql-client
# Note: remember to update doc-url and debian-name below!
#
-version: 8.0.15+14
+version: 8.0.15+15
project: mysql
summary: MySQL command-line client
diff --git a/mysql-client/mysql/buildfile b/mysql-client/mysql/buildfile
index 654758d..921bff5 100644
--- a/mysql-client/mysql/buildfile
+++ b/mysql-client/mysql/buildfile
@@ -15,9 +15,10 @@ import libs = libmysqlclient%liba{mysqlclient}
# Note that the mysql utility doesn't use openssl directly. We however import
# libcrypto so that the included by some common headers <openssl/opensslv.h>
-# can be found.
+# can be found. Also note that we link it statically to be consistent with
+# libssl.a, linked implicitly via libmysqlclient.a.
#
-import libs += libcrypto%lib{crypto}
+import libs += libcrypto%liba{crypto}
if! $windows
import libs += libisocline%liba{isocline}