mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
MDEV-14953 - rename libmysqld.so to libmariadbd.so
This commit is contained in:
parent
bbdb47ffe4
commit
6c5d364956
3 changed files with 9 additions and 4 deletions
2
debian/libmariadbd-dev.install
vendored
2
debian/libmariadbd-dev.install
vendored
|
@ -1,2 +1,4 @@
|
||||||
usr/lib/*/libmysqld.a
|
usr/lib/*/libmysqld.a
|
||||||
|
usr/lib/*/libmariadbd.a
|
||||||
usr/lib/*/libmysqld.so
|
usr/lib/*/libmysqld.so
|
||||||
|
usr/lib/*/libmariadbd.so
|
||||||
|
|
2
debian/libmariadbd19.install
vendored
2
debian/libmariadbd19.install
vendored
|
@ -1 +1 @@
|
||||||
usr/lib/*/libmysqld.so.*
|
usr/lib/*/libmariadbd.so.*
|
||||||
|
|
|
@ -138,7 +138,7 @@ IF(WIN32)
|
||||||
SET(COMPONENT_MYSQLSERVER "Embedded")
|
SET(COMPONENT_MYSQLSERVER "Embedded")
|
||||||
SET(COMPONENT_LIBMYSQLD "Embedded")
|
SET(COMPONENT_LIBMYSQLD "Embedded")
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(MYSQLSERVER_OUTPUT_NAME mysqld)
|
SET(MYSQLSERVER_OUTPUT_NAME mariadbd)
|
||||||
SET(COMPONENT_MYSQLSERVER "Development")
|
SET(COMPONENT_MYSQLSERVER "Development")
|
||||||
SET(COMPONENT_LIBMYSQLD "Server")
|
SET(COMPONENT_LIBMYSQLD "Server")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
@ -166,7 +166,9 @@ ENDFOREACH()
|
||||||
|
|
||||||
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
|
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
|
||||||
OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER})
|
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})
|
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
|
# Name the shared library, handle versioning (provides same api as client
|
||||||
# library hence the same version)
|
# library hence the same version)
|
||||||
SET_TARGET_PROPERTIES(libmysqld PROPERTIES
|
SET_TARGET_PROPERTIES(libmysqld PROPERTIES
|
||||||
OUTPUT_NAME mysqld
|
OUTPUT_NAME mariadbd
|
||||||
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
|
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
|
# Clean direct output flags, as 2 targets have the same base name
|
||||||
# libmysqld
|
# libmysqld
|
||||||
SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||||
|
|
Loading…
Reference in a new issue