From b2891a8ddd1316c7041479200f9159b46484c795 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 16 Jul 2018 15:49:22 +0200 Subject: Use new in module instead of tricking version's rule --- build/root.build | 2 ++ mysql/buildfile | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/root.build b/build/root.build index 2f68b9e..25b7169 100644 --- a/build/root.build +++ b/build/root.build @@ -8,3 +8,5 @@ using c h{*}: extension = h c{*}: extension = c + +using in diff --git a/mysql/buildfile b/mysql/buildfile index 67617fa..490c1c6 100644 --- a/mysql/buildfile +++ b/mysql/buildfile @@ -37,9 +37,7 @@ lib{mariadb}: libmariadb/{ c}{ma_tls} \ # lib{mariadb}: libmariadb/def{mariadbclient}: include = $windows -libmariadb/def{mariadbclient}: libmariadb/in{mariadbclient_win32} \ - $src_root/manifest # @@ TMP - +libmariadb/def{mariadbclient}: libmariadb/in{mariadbclient_win32} libmariadb/def{mariadbclient}: mariadb_deinitialize_ssl = \ ($with_ssl ? 'mariadb_deinitialize_ssl' : '') @@ -97,8 +95,7 @@ h{version}: CC_SOURCE_REVISION = '' # generating machinery (this is why the redundant $src_root/manifest # prerequisite). # -libmariadb/c{ma_client_plugin}: libmariadb/in{ma_client_plugin} \ - $src_root/manifest # @@ TMP +libmariadb/c{ma_client_plugin}: libmariadb/in{ma_client_plugin} libmariadb/c{ma_client_plugin}: in.symbol = '@' libmariadb/c{ma_client_plugin}: in.substitution = lax libmariadb/c{ma_client_plugin}: EXTERNAL_PLUGINS = '' -- cgit v1.1