diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-02-10 12:50:27 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-02-10 12:50:27 -0500 |
| commit | a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a (patch) | |
| tree | 875f73523db8f6e4592d4dfbe72e05b67006613a | |
| parent | Adjust patches for mysql-cluster-7.2.x (diff) | |
| download | mysql-extras-a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a.tar.gz mysql-extras-a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a.tar.bz2 mysql-extras-a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a.zip | |
Fix multilib compile of libndbclient due to missing WITHOUT_SERVER checkmysql-extras-20150210-1758Z
| -rw-r--r-- | 00000_index.txt | 5 | ||||
| -rw-r--r-- | 30000_all_mysql-cluster-multilib-property.patch | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index f1c2852..11046cb 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1898,3 +1898,8 @@ @@ Bug 537872 @@ Upstream bug 75622 +@patch 30000_all_mysql-cluster-multilib-property.patch +@ver 7.03.00.00 to 7.99.99.99 +@pn mysql-cluster +@@ Fix property added to something not built with WITHOUT_SERVER + diff --git a/30000_all_mysql-cluster-multilib-property.patch b/30000_all_mysql-cluster-multilib-property.patch new file mode 100644 index 0000000..c4cc2d4 --- /dev/null +++ b/30000_all_mysql-cluster-multilib-property.patch @@ -0,0 +1,14 @@ +diff -aurN a/storage/ndb/CMakeLists.txt b/storage/ndb/CMakeLists.txt +--- a/storage/ndb/CMakeLists.txt 2015-02-10 12:21:44.502545905 -0500 ++++ b/storage/ndb/CMakeLists.txt 2015-02-10 12:30:53.985233768 -0500 +@@ -145,7 +145,9 @@ + # Add HAVE_NDB_BINLOG to the list of compile definitions used when compiling + # the ndbcluster plugin library(NOTE! there is also ndbcluster_embedded which + # is compiled without this define) +-NDB_ADD_TARGET_PROPERTY(ndbcluster COMPILE_DEFINITIONS "HAVE_NDB_BINLOG") ++IF(NOT WITHOUT_SERVER) ++ NDB_ADD_TARGET_PROPERTY(ndbcluster COMPILE_DEFINITIONS "HAVE_NDB_BINLOG") ++ENDIF() + + IF(CMAKE_SIZEOF_VOID_P EQUAL 4) + MESSAGE(STATUS "Building NDB 32-bit") |