diff options
| -rw-r--r-- | manifest | 8 | ||||
| -rw-r--r-- | mysql/buildfile | 93 |
2 files changed, 61 insertions, 40 deletions
@@ -1,6 +1,6 @@ : 1 name: libmariadb -version: 10.2.10+5 +version: 10.2.10+6 project: mariadb summary: MariaDB C API client library license: LGPLv2.1 @@ -13,6 +13,6 @@ package-url: https://git.build2.org/cgit/packaging/mariadb/ email: maria-discuss@lists.launchpad.net ; Mailing list. package-email: packaging@build2.org ; Mailing list. build-error-email: builds@build2.org -#builds: all -depends: * build2 >= 0.8.0- -depends: * bpkg >= 0.8.0- +builds: all +depends: * build2 >= 0.9.0 +depends: * bpkg >= 0.9.0 diff --git a/mysql/buildfile b/mysql/buildfile index b76ea2e..0a40bcd 100644 --- a/mysql/buildfile +++ b/mysql/buildfile @@ -45,13 +45,6 @@ libmariadb/def{mariadbclient}: mariadb_deinitialize_ssl = \ # lib{mariadb}: zlib/file{README} -# See bootstrap.build for details. -# -if $version.pre_release - lib{mariadb}: bin.lib.version = @"-$version.project_id" -else - lib{mariadb}: bin.lib.version = @"-$abi_version" - # Include the generated version header into the distribution (so that we don't # pick up an installed one) and don't remove it when cleaning in src (so that # clean results in a state identical to distributed). @@ -66,47 +59,66 @@ else # Source package: /tmp/mysql.sock # h{version}: in{version} $src_root/manifest +h{version}: +{ + dist = true + clean = ($src_root != $out_root) + + in.symbol = '@' + + PROTOCOL_VERSION = $protocol_version + MARIADB_CLIENT_VERSION = $version.project + MARIADB_BASE_VERSION = "mariadb-$version.major.$version.minor" + + MARIADB_VERSION_ID = \ + "\(10000 * $version.major + 100 * $version.minor + $version.patch\)" + + MYSQL_VERSION_ID = $MARIADB_VERSION_ID + MARIADB_PORT = 3306 + MARIADB_UNIX_ADDR = ($windows ? '': /tmp/mysql.sock) + CPACK_PACKAGE_VERSION = "$client_major.$client_minor.$client_patch" + + MARIADB_PACKAGE_VERSION_ID = \ + "\(10000 * $client_major + 100 * $client_minor + $client_patch\)" + + CMAKE_SYSTEM_NAME = $tsys + CMAKE_SYSTEM_PROCESSOR = $c.target.cpu + + PLUGINDIR = ($install.root != [null] \ + ? $regex.replace($install.resolve($install.lib)/mariadb/plugin, \ + '\\', \ + '/') \ + : '') -h{version}: dist = true -h{version}: clean = ($src_root != $out_root) -h{version}: in.symbol = '@' - -h{version}: PROTOCOL_VERSION = $protocol_version -h{version}: MARIADB_CLIENT_VERSION = $version.project -h{version}: MARIADB_BASE_VERSION = "mariadb-$version.major.$version.minor" -h{version}: MARIADB_VERSION_ID = \ - "\(10000 * $version.major + 100 * $version.minor + $version.patch\)" -h{version}: MYSQL_VERSION_ID = $MARIADB_VERSION_ID -h{version}: MARIADB_PORT = 3306 -h{version}: MARIADB_UNIX_ADDR = ($windows ? '': /tmp/mysql.sock) -h{version}: CPACK_PACKAGE_VERSION = "$client_major.$client_minor.$client_patch" -h{version}: MARIADB_PACKAGE_VERSION_ID = \ - "\(10000 * $client_major + 100 * $client_minor + $client_patch\)" -h{version}: CMAKE_SYSTEM_NAME = $tsys -h{version}: CMAKE_SYSTEM_PROCESSOR = $c.target.cpu -h{version}: PLUGINDIR = \ - ($install.root != [null] \ - ? $regex.replace($install.resolve($install.lib)/mariadb/plugin, '\\', '/') \ - : '') -h{version}: default_charset = '' -h{version}: CC_SOURCE_REVISION = '' + default_charset = '' + CC_SOURCE_REVISION = '' +} 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 = '' -libmariadb/c{ma_client_plugin}: BUILTIN_PLUGINS = '' +libmariadb/c{ma_client_plugin}: +{ + in.symbol = '@' + in.substitution = lax + + EXTERNAL_PLUGINS = '' + BUILTIN_PLUGINS = '' +} for p: 'pvio_socket' 'native_password_client' 'old_password_client' \ ($windows ? 'pvio_npipe' 'pvio_shmem' : ) { - libmariadb/c{ma_client_plugin}: EXTERNAL_PLUGINS = "$EXTERNAL_PLUGINS + libmariadb/c{ma_client_plugin}: + { + EXTERNAL_PLUGINS = "$EXTERNAL_PLUGINS extern struct st_mysql_client_plugin $(p)_plugin;" - libmariadb/c{ma_client_plugin}: BUILTIN_PLUGINS = "$BUILTIN_PLUGINS + BUILTIN_PLUGINS = "$BUILTIN_PLUGINS \(struct st_mysql_client_plugin *\)&$(p)_plugin," + } } +# Build options. +# # We have dropped the macro definitions that are not used in the package code: # # -DHAVE_AUTH_CLEARTEXT=1 -DHAVE_AUTH_DIALOG=1 -DHAVE_AUTH_NATIVE=1 @@ -231,10 +243,19 @@ else '(.+)', \ $tsys == 'mingw32' ? '-l\1' : '\1.lib') +# Export options. +# # The library clients must include the API header as <mysql/mysql.h>. # lib{mariadb}: cc.export.poptions = "-I$out_root" "-I$src_root" +# See bootstrap.build for details. +# +if $version.pre_release + lib{mariadb}: bin.lib.version = @"-$version.project_id" +else + lib{mariadb}: bin.lib.version = @"-$abi_version" + # Let's install the bare minimum of headers: mysql.h, errmsg.h, mysqld_error.h # and headers they recursively include. # |