maria-developers team mailing list archive

[Sylvain Raybaud <sylvain.raybaud@xxxxxxxxxxxxxxxxxxxxxxx>]

Good afternoon,

On 14/10/2014 14:58, Sylvain Raybaud wrote:
> Hi again
> 
> On 14/08/2014 14:48, Sergei Golubchik wrote:
>> Yes, you can compile without XtraDB. I think -DWITHOUT_XTRADB=1 will do.
>>
>> [...]
> 
> Unfortunately it seems that even if I set -DWITHOUT_XTRADB=1 the test is
> still run:
> 
> $ cmake -DWITHOUT_XTRADB=1 ..
> [...]
> CMake Error at storage/xtradb/CMakeLists.txt:435 (MESSAGE):
>   Percona XtraDB is not supported on this platform
> 
> 
> -- Configuring incomplete, errors occurred!
> [...]
> 
> Is there an easy workaround?
> 
> It seems to me that CONFIGURE_PLUGINS (defined in cmake/plugin.cmake)
> will try to configure everything in storage/*. Maybe this should be
> patched? Or maybe storage/xtradb/CMakeList.txt should be modified to
> exit silently if WITHOUT_XTRADB if set. For example the attached "quick
> and dirty" patch seems to do the trick for me.
> 

FYI, the same problem still holds with mariadb galera cluster 10.0.14,
fixed by the same quick and dirty patch with very minor modifications
(line numbers).

regards,


-- 
Sylvain Raybaud
www.green-communications.fr

--- a/storage/xtradb/CMakeLists.txt	2014-10-30 16:24:33.160188627 +0100
+++ b/storage/xtradb/CMakeLists.txt	2014-10-30 16:25:09.060188829 +0100
@@ -470,12 +470,13 @@
   SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)
 ENDIF()
 
-IF(XTRADB_OK)
-  MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
-    DEFAULT
-    RECOMPILE_FOR_EMBEDDED
-    LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
-ELSE()
-  MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
+IF(NOT WITHOUT_XTRADB)
+  IF(XTRADB_OK)
+    MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
+      DEFAULT
+      RECOMPILE_FOR_EMBEDDED
+      LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
+  ELSE()
+    MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
+  ENDIF()
 ENDIF()
-

Attachment: signature.asc
Description: OpenPGP digital signature