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 7A9B41397EC for ; Wed, 19 Aug 2015 12:49:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 134E7142F3; Wed, 19 Aug 2015 12:49:14 +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 B2E12142F3 for ; Wed, 19 Aug 2015 12:49:13 +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 03E4D340A69 for ; Wed, 19 Aug 2015 12:49:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88FBA14E for ; Wed, 19 Aug 2015 12:49:11 +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: <1439988756.16c910d49cb01e8b14c7f4ce715e86a5b972175a.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/galera/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/galera/galera-25.3.10.ebuild X-VCS-Directories: sys-cluster/galera/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 16c910d49cb01e8b14c7f4ce715e86a5b972175a X-VCS-Branch: master Date: Wed, 19 Aug 2015 12:49:11 +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: 122508f8-c25f-414c-b85c-b55fab06f92e X-Archives-Hash: 70776f3b13ab070ca1617e0f991a04ec commit: 16c910d49cb01e8b14c7f4ce715e86a5b972175a Author: Brian Evans gentoo org> AuthorDate: Wed Aug 19 12:52:36 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Aug 19 12:52:36 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c910d4 sys-cluster/galera: Revert changes from 'Version bump' Accidentally thought this was to be bumped when it was already here Package-Manager: portage-2.2.20.1 sys-cluster/galera/galera-25.3.10.ebuild | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild index 96a2e5c..43ed873 100644 --- a/sys-cluster/galera/galera-25.3.10.ebuild +++ b/sys-cluster/galera/galera-25.3.10.ebuild @@ -6,7 +6,7 @@ EAPI=5 MY_P="${PN}-3-${PV}" -inherit scons-utils multilib toolchain-funcs eutils user +inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API" HOMEPAGE="http://www.galeracluster.com" SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz" @@ -15,11 +15,11 @@ LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="garbd ssl test" +IUSE="cpu_flags_x86_sse4_2 garbd ssl test" CDEPEND=" ssl? ( dev-libs/openssl:0= ) - >=dev-libs/boost-1.41 + >=dev-libs/boost-1.41:0= " DEPEND="${DEPEND} ${CDEPEND} @@ -44,7 +44,8 @@ src_prepare() { rm -r "${S}/asio" || die # Respect {C,LD}FLAGS. - epatch "${FILESDIR}/respect-flags.patch" + epatch "${FILESDIR}/respect-flags.patch" \ + "${FILESDIR}/galera-strip-machine-cflags.patch" #Remove optional garbd daemon if ! use garbd ; then @@ -56,6 +57,12 @@ src_prepare() { src_configure() { tc-export CC CXX + # Uses hardware specific code that seems to depend on SSE4.2 + if use cpu_flags_x86_sse4_2 ; then + append-cflags -msse4.2 + else + append-cflags -DCRC32C_NO_HARDWARE + fi # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, # and -Wold-style-cast myesconsargs=( @@ -75,6 +82,7 @@ src_install() { dobin garb/garbd newconfd "${FILESDIR}/garb.cnf" garbd newinitd "${FILESDIR}/garb.sh" garbd + doman man/garbd.8 fi exeinto /usr/$(get_libdir)/${PN} doexe libgalera_smm.so