diff options
Diffstat (limited to 'mysql-client')
-rw-r--r-- | mysql-client/README-DEV | 3 | ||||
-rw-r--r-- | mysql-client/manifest | 4 | ||||
-rw-r--r-- | mysql-client/mysql/buildfile | 5 | ||||
l--------- | mysql-client/mysql/include | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/mysql-client/README-DEV b/mysql-client/README-DEV index 6259c46..7c978bf 100644 --- a/mysql-client/README-DEV +++ b/mysql-client/README-DEV @@ -9,7 +9,8 @@ $ ln -s ../upstream/LICENSE $ mkdir -p mysql/{client,downstream} $ ln -s ../../../upstream/client/{{mysql,readline,completion_hash,pattern_matcher}.cc,{client_priv,my_readline,pattern_matcher,completion_hash}.h} mysql/client $ ln -s ../../libmysqlclient/mysql/{my_config,mysqld_error}.h mysql/ -$ ln -s ../../upstream/{include,libbinlogevents} mysql/ +$ ln -s ../../upstream/libbinlogevents mysql/ +$ ln -s ../../libmysqlclient/mysql/mysql mysql/include Create mysql/downstream/mysql_version.h, so it can be found when included as "mysql_version.h" (which, for example, mysql.h does). diff --git a/mysql-client/manifest b/mysql-client/manifest index 01a1452..c59bacd 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+16 project: mysql summary: MySQL command-line client @@ -19,8 +19,6 @@ package-email: packaging@build2.org ; Mailing list. build-error-email: builds@build2.org builds: all builds: -wasm -builds: -( +windows &gcc ) ; MinGW GCC is not supported. -builds: -static ; Implementation uses C++ and requires special linking steps. depends: * build2 >= 0.15.0 depends: * bpkg >= 0.15.0 depends: libmysqlclient == $ 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} diff --git a/mysql-client/mysql/include b/mysql-client/mysql/include index 01fbb48..1bffabb 120000 --- a/mysql-client/mysql/include +++ b/mysql-client/mysql/include @@ -1 +1 @@ -../../upstream/include
\ No newline at end of file +../../libmysqlclient/mysql/mysql
\ No newline at end of file |