From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5DE4D138A1A for ; Tue, 10 Feb 2015 17:50:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94017E096F; Tue, 10 Feb 2015 17:50:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A2BBE096F for ; Tue, 10 Feb 2015 17:50:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3080534078F for ; Tue, 10 Feb 2015 17:50:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC83011786 for ; Tue, 10 Feb 2015 17:50:37 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1423590627.a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 30000_all_mysql-cluster-multilib-property.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a X-VCS-Branch: master Date: Tue, 10 Feb 2015 17:50:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0209d2d7-09fc-441f-a6fc-d25dff7104f6 X-Archives-Hash: 7a3206ec41e45470335e2c271c1c701c commit: a0d3d0ac6c9c8b10f715c5ae5a0e7d342392c64a Author: Brian Evans gentoo org> AuthorDate: Tue Feb 10 17:50:27 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Feb 10 17:50:27 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=a0d3d0ac Fix multilib compile of libndbclient due to missing WITHOUT_SERVER check --- 00000_index.txt | 5 +++++ 30000_all_mysql-cluster-multilib-property.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+) 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")