diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:50:50 +0100 |
| commit | ac8dd6beb917f9b8d14409b565f259043d816e2b (patch) | |
| tree | 2dcd19f605758aa9c34ca77b4eb1bb46bcc4e50f /cmake | |
| parent | dfc1901e806bdda129b8943585f2ccfc8c207322 (diff) | |
| parent | 6be24a771a27a077d58d21a4a1f8db3fbd14cac4 (diff) | |
| download | mariadb-git-ac8dd6beb917f9b8d14409b565f259043d816e2b.tar.gz | |
merged
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index ee6d6b85004..53157b4e2c0 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -115,9 +115,9 @@ IF(UNIX) OPTION(WITH_LIBEDIT "" ON) ENDIF() - OPTION(WITH_PIC "" ON) # Why? IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") + IF(NOT IGNORE_AIO_CHECK) # Ensure aio is available on Linux (required by InnoDB) CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H) @@ -133,6 +133,14 @@ IF(UNIX) If you really do not want it, pass -DIGNORE_AIO_CHECK to cmake. ") ENDIF() + + # Remove libaio dependency from mysqld + SET(XTRADB_PREFER_STATIC_LIBAIO 1) + + # Unfortunately, linking shared libmysqld with static aio + # does not work, unless we add also dynamic one. This also means + # libmysqld.so will depend on libaio.so + SET(LIBMYSQLD_SO_EXTRA_LIBS aio) ENDIF() # Enable fast mutexes on Linux |