diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-06-12 12:00:21 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-06-12 12:00:21 +0200 |
| commit | 6eaf1962e89e5cd0769aa459af7bbd4aabf0574e (patch) | |
| tree | 74bdf516ed876a43ae3697cc835115e7d1cc1970 | |
| parent | 154e0454ad9fc9ec7614db19cb9f2bc592d9edff (diff) | |
Use built-in support for .def files
| -rw-r--r-- | manifest | 4 | ||||
| -rw-r--r-- | mysql/buildfile | 12 |
2 files changed, 4 insertions, 12 deletions
@@ -12,5 +12,5 @@ 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-email: builds@build2.org -depends: * build2 >= 0.7.0- -depends: * bpkg >= 0.7.0- +depends: * build2 >= 0.8.0- +depends: * bpkg >= 0.8.0- diff --git a/mysql/buildfile b/mysql/buildfile index 243dd3c..26dc15c 100644 --- a/mysql/buildfile +++ b/mysql/buildfile @@ -2,9 +2,6 @@ # copyright : Copyright (c) 2016-2018 Code Synthesis Ltd # license : LGPLv2.1; see accompanying COPYING file -define def: file -def{*}: extension = def - # Windows-specific named pipe and shared memory based communication plugins. # pvio_win32 = pvio/pvio_npipe pvio/pvio_shmem @@ -28,6 +25,8 @@ if ($tclass == 'windows') plugins/{ c }{$pvio_win32 } \ libmariadb/{ def}{mariadbclient} # Exports. else + # Include into the distribution. + # lib{mariadb}: win-iconv/file{*.h *.c } \ plugins/file{$regex.apply($pvio_win32, '(.+)', '\1.c')} \ libmariadb/file{mariadbclient_win32.def.in} @@ -229,18 +228,11 @@ if ($tclass != 'windows') else { libs = ws2_32 shlwapi advapi32 version # secur32 - def = $out_base/libmariadb/mariadbclient.def if ($tsys == 'mingw32') - { c.libs += $regex.apply($libs, '(.+)', '-l\1') - libs{mariadb}: c.libs =+ $def - } else - { c.libs += $regex.apply($libs, '(.+)', '\1.lib') - libs{mariadb}: c.libs =+ "/DEF:$def" - } } # The library clients must include the API header as <mysql/mysql.h>. |