grknight 15/04/07 20:58:24 Modified: galera-25.3.10.ebuild ChangeLog Log: Add patch to remove machine specific CFLAGS and add new IUSE instead for one feature (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)
Revision Changes Path 1.2 sys-cluster/galera/galera-25.3.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/galera/galera-25.3.10.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/galera/galera-25.3.10.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/galera/galera-25.3.10.ebuild?r1=1.1&r2=1.2 Index: galera-25.3.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.10.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- galera-25.3.10.ebuild 24 Mar 2015 18:32:11 -0000 1.1 +++ galera-25.3.10.ebuild 7 Apr 2015 20:58:24 -0000 1.2 @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.10.ebuild,v 1.1 2015/03/24 18:32:11 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/galera-25.3.10.ebuild,v 1.2 2015/04/07 20:58:24 grknight Exp $ EAPI=5 -inherit scons-utils multilib toolchain-funcs eutils user +inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic MY_PV="release_${PV}" DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="garbd ssl test" +IUSE="cpu_flags_x86_sse4_2 garbd ssl test" CDEPEND=" ssl? ( dev-libs/openssl:0= ) @@ -49,8 +49,9 @@ # Remove bundled dev-cpp/asio rm -r "${S}/asio" || die - # Respect {C,LD}FLAGS. - epatch "${FILESDIR}/respect-flags.patch" + # Respect {C,LD}FLAGS and remove machine specific CFLAGS + epatch "${FILESDIR}/respect-flags.patch" \ + "${FILESDIR}/galera-strip-machine-cflags.patch" #Remove optional garbd daemon if ! use garbd ; then @@ -62,6 +63,12 @@ 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=( 1.6 sys-cluster/galera/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/galera/ChangeLog?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/galera/ChangeLog?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/galera/ChangeLog?r1=1.5&r2=1.6 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ChangeLog 3 Apr 2015 13:04:03 -0000 1.5 +++ ChangeLog 7 Apr 2015 20:58:24 -0000 1.6 @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/galera # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v 1.5 2015/04/03 13:04:03 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/galera/ChangeLog,v 1.6 2015/04/07 20:58:24 grknight Exp $ + + 07 Apr 2015; Brian Evans <[email protected]> + +files/galera-strip-machine-cflags.patch, galera-25.3.10.ebuild: + Add patch to remove machine specific CFLAGS and add new IUSE instead for one + feature 03 Apr 2015; Brian Evans <[email protected]> galera-25.3.5.ebuild: Add append-flags -D_REENTRANT wrt bug 545376
