database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-13208 Cannot import libmariadbclient.so.18 from python

Browse Source 
libmariadbclient_18 version nodes, specially for debian builds
This commit is contained in:
Sergei Golubchik
2017-09-20 00:02:06 +02:00
parent 2e3a16e366
commit 46a2917c0f
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libmysql/CMakeLists.txt
View File

@ -391,6 +391,10 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
*; *;
}; };
libmariadbclient_18 {
/* empty here. aliases are added above */
};
libmysqlclient_16 { libmysqlclient_16 {
/* empty here. aliases are added above */ /* empty here. aliases are added above */
}; };
@ -399,16 +403,23 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SET (CLIENT_API_5_1_LIST) SET (CLIENT_API_5_1_LIST)
SET (CLIENT_API_5_1_ALIASES) SET (CLIENT_API_5_1_ALIASES)
SET (DEBIAN9_ALIASES)
FOREACH (f ${CLIENT_API_FUNCTIONS_5_1} ${CLIENT_API_5_1_EXTRA}) FOREACH (f ${CLIENT_API_FUNCTIONS_5_1} ${CLIENT_API_5_1_EXTRA})
SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\t${f};\n") SET(CLIENT_API_5_1_LIST "${CLIENT_API_5_1_LIST}\t${f};\n")
SET(CLIENT_API_5_1_ALIASES "${CLIENT_API_5_1_ALIASES}\"${f}@libmysqlclient_16\" = ${f};\n") SET(CLIENT_API_5_1_ALIASES "${CLIENT_API_5_1_ALIASES}\"${f}@libmysqlclient_16\" = ${f};\n")
SET(DEBIAN9_ALIASES "${DEBIAN9_ALIASES}\"${f}@libmariadbclient_18\" = ${f};\n")
ENDFOREACH() ENDFOREACH()
SET (CLIENT_API_5_5_LIST) SET (CLIENT_API_5_5_LIST)
FOREACH (f ${CLIENT_API_FUNCTIONS_5_5} ${CLIENT_API_5_5_EXTRA}) FOREACH (f ${CLIENT_API_FUNCTIONS_5_5} ${CLIENT_API_5_5_EXTRA})
SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n") SET(CLIENT_API_5_5_LIST "${CLIENT_API_5_5_LIST}\t${f};\n")
SET(DEBIAN9_ALIASES "${DEBIAN9_ALIASES}\"${f}@libmariadbclient_18\" = ${f};\n")
ENDFOREACH() ENDFOREACH()
IF(NOT DEB)
SET (DEBIAN9_ALIASES)
ENDIF()
ELSE (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING) ELSE (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING)
SET (CLIENT_API_5_1_ALIASES "/* Versioning disabled per user request. MDEV-5982 */") SET (CLIENT_API_5_1_ALIASES "/* Versioning disabled per user request. MDEV-5982 */")
ENDIF (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING) ENDIF (NOT DISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING)

2
libmysql/libmysql_versions.ld.in
View File

@ -16,6 +16,8 @@
@CLIENT_API_5_1_ALIASES@ @CLIENT_API_5_1_ALIASES@
@DEBIAN9_ALIASES@
/* /*
On Fedora the following symbols are exported, but renamed into a mysql_ On Fedora the following symbols are exported, but renamed into a mysql_
namespace. We export them as aliases, but keep original symbols too. See namespace. We export them as aliases, but keep original symbols too. See