diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-25 20:50:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-25 20:50:14 +0100 |
| commit | 6be24a771a27a077d58d21a4a1f8db3fbd14cac4 (patch) | |
| tree | 5a538cb0ef4ecb753cf304c7716cbaca09526a61 /libmysqld | |
| parent | 74da49894f44a46ba086120bade714a5cc29992a (diff) | |
| download | mariadb-git-6be24a771a27a077d58d21a4a1f8db3fbd14cac4.tar.gz | |
Avoid mysqld dependency on libaio.so by linking xtradb statically to libaio.
A variable XTRADB_PREFER_STATIC_LIBAIO should be set to 1 (or TRUE
or ON) for static linking.
Even if mysqld can avoid dependency on shared libaio, shared libraries
libmysqld.so or ha_innodb.so cannot link without it.
Given that the patch primarily addresses building tar.gz package, and
shared libraries mentioned above deemed less important than mysqld
executable, we accept shared lib dependency on libaio.so
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 483e0ca05fd..9fc6ccf7543 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -157,6 +157,9 @@ IF(NOT DISABLE_SHARED) # libmysqld SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) + IF(LIBMYSQLD_SO_EXTRA_LIBS) + TARGET_LINK_LIBRARIES(libmysqld ${LIBMYSQLD_SO_EXTRA_LIBS}) + ENDIF() ENDIF() ENDIF() |