diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-02-04 15:43:26 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-02-04 15:43:26 +0100 |
| commit | bfd179e8ed5fcbad67880933d85d8852d05c7f3b (patch) | |
| tree | 0d74289df638bf00f6c773f9571810cb40588546 /libmysql/CMakeLists.txt | |
| parent | 7f444caa0ad6b2eddc730de3cd9c94bfb9037b51 (diff) | |
| download | mariadb-git-bfd179e8ed5fcbad67880933d85d8852d05c7f3b.tar.gz | |
MDEV-4127 : Export additional symbols when building RPM,
to enable both recompiling mysqli or odbc from sources in addition to drop-in replacement functionality.
The case in question is compiling mysqli from sources, that needs client_errors via ER() macro.
Previously, we exported it as mysql_client_errors (compatibly to Fedora's style symbol renaming, see MDEV-3842).
However, if MariaDB header files are used when compiling mysqli, client_errors needs to be exported with its original name.
Diffstat (limited to 'libmysql/CMakeLists.txt')
| -rw-r--r-- | libmysql/CMakeLists.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 5ad6b197379..d23a255e1b7 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -243,15 +243,22 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(RPM) # Fedora & Co declared following functions as part of API - # These functions are alias of another function (given mysql_ prefix=. The - # renaming is handled in rpm_support.cc below SET(CLIENT_API_EXTRA mysql_default_charset_info mysql_get_charset mysql_get_charset_by_csname mysql_net_realloc mysql_client_errors - ) + + # Also export the non-renamed variants + # (in case someone wants to rebuild mysqli-php or something similar) + # See MDEV-4127 + default_charset_info + get_charset + get_charset_by_csname + net_realloc + client_errors) + # Add special script to fix symbols renames by Fedora SET(CLIENT_SOURCES_EXTRA ${CLIENT_SOURCES} rpm_support.cc) SET(VERSION_SCRIPT_TEMPLATE |