Commit 46a2917c authored by Sergei Golubchik's avatar Sergei Golubchik

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

libmariadbclient_18 version nodes, specially for debian builds
parent 2e3a16e3
...@@ -391,6 +391,10 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ...@@ -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") ...@@ -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)
......
...@@ -16,6 +16,8 @@ ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment