Commit 4be4d57d authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-22887 unresolved symbol crc32c_vpmsum on Ubuntu Xenial

This is one more follow-up fix to MDEV-22641.

Explicitly specify the dependency of the innobase library on mysys.

Also, remove stale references to CRC32_LIBRARY, which should have
been removed in commit dec3f8ca.
parent 4080e3ac
# Copyright (c) 2006, 2011, Oracle and/or its affiliates. # Copyright (c) 2006, 2011, Oracle and/or its affiliates.
# Copyright (c) 2009, 2018, MariaDB Corporation # Copyright (c) 2009, 2020, MariaDB Corporation
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -462,9 +462,8 @@ IF(NOT DISABLE_SHARED) ...@@ -462,9 +462,8 @@ IF(NOT DISABLE_SHARED)
# 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)
TARGET_LINK_LIBRARIES(libmysqld ${CRC32_LIBRARY})
SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
TARGET_LINK_LIBRARIES(mysqlserver ${CRC32_LIBRARY} tpool) TARGET_LINK_LIBRARIES(mysqlserver tpool)
IF(LIBMYSQLD_SO_EXTRA_LIBS) IF(LIBMYSQLD_SO_EXTRA_LIBS)
TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS}) TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS})
ENDIF() ENDIF()
......
...@@ -363,7 +363,6 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE ...@@ -363,7 +363,6 @@ MYSQL_ADD_PLUGIN(innobase ${INNOBASE_SOURCES} STORAGE_ENGINE
DEFAULT RECOMPILE_FOR_EMBEDDED DEFAULT RECOMPILE_FOR_EMBEDDED
LINK_LIBRARIES LINK_LIBRARIES
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${CRC32_LIBRARY}
${NUMA_LIBRARY} ${NUMA_LIBRARY}
${LIBSYSTEMD} ${LIBSYSTEMD}
${LINKER_SCRIPT} ${LINKER_SCRIPT}
...@@ -405,6 +404,6 @@ IF(MSVC) ...@@ -405,6 +404,6 @@ IF(MSVC)
ENDIF() ENDIF()
IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC)) IF(NOT (PLUGIN_INNOBASE STREQUAL DYNAMIC))
TARGET_LINK_LIBRARIES(innobase tpool) TARGET_LINK_LIBRARIES(innobase tpool mysys)
ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/mariabackup ${CMAKE_BINARY_DIR}/extra/mariabackup)
ENDIF() ENDIF()
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