database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

MDEV-14953 - rename libmysqld.so to libmariadbd.so

Browse Source
This commit is contained in:
Vladislav Vaintroub
2018-02-08 12:02:49 +00:00
parent bbdb47ffe4
commit 6c5d364956
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/libmariadbd-dev.install vendored
View File

@@ -1,2 +1,4 @@
usr/lib/*/libmysqld.a
usr/lib/*/libmariadbd.a
usr/lib/*/libmysqld.so
usr/lib/*/libmariadbd.so

2
debian/libmariadbd19.install vendored
View File

@@ -1 +1 @@
usr/lib/*/libmysqld.so.*
usr/lib/*/libmariadbd.so.*

9
libmysqld/CMakeLists.txt
View File

@@ -138,7 +138,7 @@ IF(WIN32)
SET(COMPONENT_MYSQLSERVER "Embedded")
SET(COMPONENT_LIBMYSQLD "Embedded")
ELSE()
SET(MYSQLSERVER_OUTPUT_NAME mysqld)
SET(MYSQLSERVER_OUTPUT_NAME mariadbd)
SET(COMPONENT_MYSQLSERVER "Development")
SET(COMPONENT_LIBMYSQLD "Server")
ENDIF()
@@ -166,7 +166,9 @@ ENDFOREACH()
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER})
IF(UNIX)
INSTALL_SYMLINK(libmysqld.a mysqlserver ${INSTALL_LIBDIR} ${COMPONENT_MYSQLSERVER})
ENDIF()
INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT ${COMPONENT_MYSQLSERVER})
@@ -438,8 +440,9 @@ IF(NOT DISABLE_SHARED)
# Name the shared library, handle versioning (provides same api as client
# library hence the same version)
SET_TARGET_PROPERTIES(libmysqld PROPERTIES
OUTPUT_NAME mysqld
OUTPUT_NAME mariadbd
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
INSTALL_SYMLINK(libmysqld.so libmysqld ${INSTALL_LIBDIR} ${COMPONENT_LIBMYSQLD})
# Clean direct output flags, as 2 targets have the same base name
# libmysqld
SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)