Skip to content

Commit 6c5d364

Browse files
committed
MDEV-14953 - rename libmysqld.so to libmariadbd.so
1 parent bbdb47f commit 6c5d364

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

debian/libmariadbd-dev.install

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
usr/lib/*/libmysqld.a
2+
usr/lib/*/libmariadbd.a
23
usr/lib/*/libmysqld.so
4+
usr/lib/*/libmariadbd.so

debian/libmariadbd19.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/lib/*/libmysqld.so.*
1+
usr/lib/*/libmariadbd.so.*

libmysqld/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ IF(WIN32)
138138
SET(COMPONENT_MYSQLSERVER "Embedded")
139139
SET(COMPONENT_LIBMYSQLD "Embedded")
140140
ELSE()
141-
SET(MYSQLSERVER_OUTPUT_NAME mysqld)
141+
SET(MYSQLSERVER_OUTPUT_NAME mariadbd)
142142
SET(COMPONENT_MYSQLSERVER "Development")
143143
SET(COMPONENT_LIBMYSQLD "Server")
144144
ENDIF()
@@ -166,7 +166,9 @@ ENDFOREACH()
166166

167167
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
168168
OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT ${COMPONENT_MYSQLSERVER})
169-
169+
IF(UNIX)
170+
INSTALL_SYMLINK(libmysqld.a mysqlserver ${INSTALL_LIBDIR} ${COMPONENT_MYSQLSERVER})
171+
ENDIF()
170172
INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT ${COMPONENT_MYSQLSERVER})
171173

172174

@@ -438,8 +440,9 @@ IF(NOT DISABLE_SHARED)
438440
# Name the shared library, handle versioning (provides same api as client
439441
# library hence the same version)
440442
SET_TARGET_PROPERTIES(libmysqld PROPERTIES
441-
OUTPUT_NAME mysqld
443+
OUTPUT_NAME mariadbd
442444
SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
445+
INSTALL_SYMLINK(libmysqld.so libmysqld ${INSTALL_LIBDIR} ${COMPONENT_LIBMYSQLD})
443446
# Clean direct output flags, as 2 targets have the same base name
444447
# libmysqld
445448
SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)

0 commit comments

Comments
 (0)