Add patch to remove machine specific CFLAGS and add new IUSE instead for one feature

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

4 files changed, 98 insertions, 21 deletions

diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
index f9003707d176..4b4326106b82 100644
--- a/sys-cluster/galera/ChangeLog
+++ b/sys-cluster/galera/ChangeLog
@@ -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 <grknight@gentoo.org>
+  +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 <grknight@gentoo.org> galera-25.3.5.ebuild:
   Add append-flags -D_REENTRANT wrt bug 545376
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index a3fe7c3ab871..9a118274635f 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -2,29 +2,32 @@
 Hash: SHA256
 
 AUX disable-tests.patch 2703 SHA256 80da2484a51c7ff6f9a1ccd37481c006d87fb1e0964600a132d6a72fc3eba6fa SHA512 6ae782e9ab346c77be434c285d3bb291cc3056b0180c4b8987ab8356e793999e4efb40b9e516a01f3fe2486fcc63339fc6a6b6ba7ea470b65cf408c1c3098e9b WHIRLPOOL 9e5702fe21e13e91a43b61708c35b491c33a048277d390f86c34e80c22652b6d61fd8fc5058db6a136195cfdb1ae1717f753cfe9ea6c3b889702385f41d1cee4
+AUX galera-strip-machine-cflags.patch 2196 SHA256 068ada21167a0bff9a0c4ab4fffcf14bfae1e1fc2ac3ad2ae228bda54f5525bc SHA512 7c62cca31219b05ef1ada9bf0b6afc82c0e4de1e774ee36d55f11119dfc3e8b816d4c8c07051ba0216e95f174b7564b79d702ad9e148fbca23305b0539cbd6cf WHIRLPOOL 99195107e133ed056f53cce5723b7ee41d936180fa908bfd22e356d55d4f72da08d973fb586dca7175fc3b644ab795eb19edcb5ddda3f31158595a5d00795e45
 AUX garb.cnf 526 SHA256 5fdf48f4a908c1b4cd680dc607ec6fee11ae098893bd66fd8a18ed11dab958ea SHA512 e7ca11b169074e70d62a49f9b494f502ebe051f543ef5bd5e24ded6dc1ba7080f2d9813de7ba870783290a67f1e01dc8a57902d9f90544e7470c42947a383689 WHIRLPOOL 8a1e0db0c49ac863a1055933bbbe105522282b7d887834db471fcadb5ce384a5896aa844d0580ed26fb7bec3f3f20967cbd385bc902551decfbad3d9bda6cde5
 AUX garb.sh 1334 SHA256 3a0aa38a6f49ed271276af5ffe694acb2437f0e5a9093fcad55d951b4bb82241 SHA512 819c6879ab0f0500c00de1270c431c3a078726e7b291716d6f12231c0f006c540d1ca9d89d1ca958d0ece50f4b6349b4e2a2509a55060b89ee98a7b7306917dd WHIRLPOOL feb890229eb5fed8b9c34cac1b16cf91976534753f62de8df9a9808dfd390bf1618a923ad40535af179956fe0d5637fc774cae5cafeb501a3839e01052031cba
 AUX respect-flags.patch 1210 SHA256 3c0463df1ae23d219bd411f08a238f2eabb31f29ed8c97bdc4433b7031942dc8 SHA512 73a9284d8da412f822ec2a57811c1785a5057d10f647184ead9ae6eb4469d0bd0efada3f53b1ce40700d4f161bae05761abf7800ffce8c91f0e8fbda571cfde7 WHIRLPOOL 5a23ad3dc3710987ff22deb5cebee93220b821fb0700bfd5626c836be1001d907f9bfb376ad659afa74426ff59e6d80f0aafac344001c12180afc4ff2d03d199
 DIST galera-25.3.10.tar.gz 2950372 SHA256 33a749f71e478d068982845524a44fe18d1c59c168e1fee8b92baca763982b2d SHA512 c08420b72e446c93645012ec04465c4cb65152bd3eaa840142fafdcb6945f76e77e2be00cf68930227656b78c25cd5ce36ebe823d6fcbcd320e6ae91b3b38a5c WHIRLPOOL 87a271f3e03de3da70cb302ff6559c70d65097b1b639b8ae1501afe0ef9328bc746ae828daac8cc5cbd4ef0f8cd861a72739d7154709f3122d7bb4e1f3ab57bd
 DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
-EBUILD galera-25.3.10.ebuild 1872 SHA256 b813b2ac350c4d88b7dfced377e5f1a3bbb913add1cf7631c249af515d7e38eb SHA512 a17b185317b62e1aa20e153ab7f5dc185e22c1fa91d3ede3668607c586d2002b573420f2d2b94f198249810b976f505a73083e2ac90455ca568d78d3aca67acd WHIRLPOOL edadc43fb340bdca7ea4bc06a62df5024b33d863ae816972304e25ade8564f9ea1f60442d963e2e6e566ce580bf61f4413d1b28f4d080088091d0d58cda9c8c8
+EBUILD galera-25.3.10.ebuild 2162 SHA256 dc05e4bee499920a309af850a6cbcda9014e69b757ee38823f2b935f925ca866 SHA512 f253c8e98d796dfd9d7976db6df9dcd8c3766643435e46b2ed918f6ee9fbec691238bc4df895c4da1fd2eaefbd4f468bff63d0d63f4c2960ad4021fa344039e7 WHIRLPOOL 183d705586c9fc0d88ccc4c706c8903ed9850921ed76f8f72f492f433eb3d68c43adb556b7ad382de46423b52e72957bf69b6605bbd1bc3f509b99dba86f19fc
 EBUILD galera-25.3.5.ebuild 1965 SHA256 dfad21ed778902d7c9509b6ce2dd3cd0491e64afa390038598ef1994900efd52 SHA512 00b10de46b77356045c30c95bb6fee4ceaced01cfb55ceac72abc13d26699e23a39310a5d8d65d3eca02ff801d7e967395d83b07d52b1f9ebbd910fb8228e7ec WHIRLPOOL d9a87f2593d5d012a3c4144a353b8afe6866484a51930595d70fa2f8dab1abb53ae4e88b7dc78849c6c6b0aa6528e71e1b05169e1224925b709ae641d81d9783
-MISC ChangeLog 1122 SHA256 62b3692f0e17393e2cf27864c760fbf8ea591fc7e565b13a305c296cf6a84ddb SHA512 a960de102d6ddb0a6493a46f75c989f2d689f0693207a81d250c176dd27ab02e96b46211dd549074f1ffcd5e1db574f81ae7898b01a5e78d10862ab20c9d0629 WHIRLPOOL 61c403dbaf9c62c6c1137723a134cdea25cda40061fe2b76103d18676a9ce1dcbb21bd93186fb17db446427a21209dd94b85d400cedbbeb244becadb625cbb8e
+MISC ChangeLog 1328 SHA256 e0e53acccf09e90a4fe0666c8f99c6705243bfb0c48a03d779014f4cb6c95e40 SHA512 950e99dfca146fda33a2d03bf294b50daca8b1b028c4724862225b8dc6f8f06714803aaab1b4e47a4e4945b88ff86eef62a100af0b5ae2407c4961de2d5353ff WHIRLPOOL 51d6b9be63ef1005ef8bafc8afadab397ea3b5fe465347109534781a4864bc67bd49dbfc509c941855a81b8a19619d0faaf42544e2924740d115f762925b4416
 MISC metadata.xml 287 SHA256 a721bbdc105190e59b893dd6045954be5335317a3cb3ee04ade10ae84e91ed66 SHA512 b948f84f81ab15a82c332c9daecd73da57f7029c09a1779475dbd08667f90932ffb05507756d2daa7035dd949979f0233ddc15a68ccce01f05ad4fc57028d582 WHIRLPOOL 4a7f7eef9bf626325e0690d772b16e8816db42cac95f4df19e6ccde55beb36671246ea9e8878b904ce93b336f2d235a56d1df795bd059161694ac67f86193da7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVHo/HAAoJENH3ge/59KO2b0YP/3Q80wDYSq7XV3knZmTuHrJ8
-nWvMeEdmdHbM/HIsQYeE0Hu3SYc9ishSPSDskXjOyT8mVahggVWeUlv/XXJ34c2C
-g+NZ42zR3VXZssmyCub3RmuYGPTQxlmrnwlSLdO2v7qQwHy/P5UFhHmFwdSv6Qfy
-FA91qxYQqrlBEz1B0A+/zl9IuNg9JD/xOy9n+jZG0FmPUojdGpC0yrxqxvvRTDsi
-iweLhy9x2yMyXy+524eELiAJDIS+9Cj+g+XeRgezFOMfh0bVh2IFKOtdW0i9ohfz
-Z9JVhLo5vX162rBmCJl1k6bik4y4Xk7J/6UHW7nMk4byZUZ6V2SDhKUZaK1/5L+5
-bExEJ73vJ9cvEx8NpgTz41rJTUrnmrx5M0o3D+tFhgPdgVBp67hcsv0QzQCEuYX6
-lpqMPh79ilLOsb0H0nI/h0XQa01RsofOaQjSl1n8FM0VpgLxPHQ4ZPLAwTJRDVSc
-SUnrDQcLuvZr9z1AvFvdliGmwTzT5Kslknc+j26pfhJl98Buu6Ie9+WOCA5Kb/uU
-ltarY9GchZnGxfB3sf+EHYLh2qxgY1uHUd15sD2sTlqcYLlAWPTF3XpHDWyw1gJG
-ej64WLUbEHn0NU/9K9o3LH6S8sq70uOK9pWGwxZAKUOGmwNru7dJQr2i64JZoMPP
-TbLCbAQpC4OqMa6X61/3
-=kcYJ
+iQJ8BAEBCABmBQJVJET2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2FggQAJ8zlvRw0mHQ0KaYgSwMtBJZ
+XqKqmBpC2muDWjizAFdnjNthwVGkDbgEjop7qK+jMqhFLsyhoEEhrsWQgvqt+ayN
+GJIgQN9jDciPg/UnYOp++SMQZHmlTxYVibTtDOxY7wzNSkVNTY//V77XFN+RvF8B
+6VLcYuRngnJRN7UpoewTCOOQPubkIcAbulYCSijDr8iSezisd7S99S+u8cis8fQc
+HM3BAGyhSh54O+W4xikCgw6oLDnz2RmMJ6G5ZkPte0RzAGIBhhqf6mRaEQ443lYg
+WzFrY8ItnqNYzvdGHXfIB6EpvAzG9gqPiVHPWD+VV5bMU1lPjFNG8pJDUSJ6ZWm+
+o6Cd6nbBbpYOljm50OoaHrFUKAfrTPzk1K/Xo6uPv860fjeS3Ait0ivyfHjFjOy7
+smKmwJI3W75yhFSnBuMr7bImw/18SjxhM1G8WqF5aZNQRTN5LR0jMYbb9d3T5puH
+QJ8V7cEDImkT8LhTFgPOf4CBHO3ryqzV+XVjNYrsOdjG+bJGW8w99aWghxZXHaAi
+qB3Qkk1nyGv7F9yzLjxSFhEygB4e0yhhy6dOb84npgKmubNXfgTgmC8H8DfSrU5N
+vq4aEJtqwCFcPFHXpuhrsLFfhJP66lHpK53ik1akfbQaysIJVy/Ech7eUmRUhvy5
+WqfsDLt52eLYoJxBzTxn
+=nF7b
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/galera/files/galera-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-strip-machine-cflags.patch
new file mode 100644
index 000000000000..5aca0f709f44
--- /dev/null
+++ b/sys-cluster/galera/files/galera-strip-machine-cflags.patch
@@ -0,0 +1,62 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript	2015-03-16 07:18:42.000000000 -0400
++++ b/galerautils/src/SConscript	2015-04-07 15:03:21.661301200 -0400
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname')
++Import('env', 'sysname')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -33,21 +33,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86 != 0:
+-    crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2015-04-07 14:53:59.810301200 -0400
++++ b/SConstruct	2015-04-07 14:54:48.700301200 -0400
+@@ -87,27 +87,6 @@
+     opt_flags = opt_flags + ' -DGU_DBUG_ON'
+ 
+ 
+-if x86 == 32:
+-    compile_arch = ' -m32 -march=i686'
+-    link_arch    = compile_arch
+-    if sysname == 'linux':
+-        link_arch = link_arch + ' -Wl,-melf_i386'
+-elif x86 == 64 and sysname != 'sunos':
+-    compile_arch = ' -m64'
+-    link_arch    = compile_arch
+-    if sysname == 'linux':
+-        link_arch = link_arch + ' -Wl,-melf_x86_64'
+-elif machine == 'ppc64':
+-    compile_arch = ' -mtune=native'
+-    link_arch    = ''
+-elif sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-    link_arch    = ''
+-else:
+-    compile_arch = ''
+-    link_arch    = ''
+-
+-
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ ssl        = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild
index 6587abecb3d0..ed5ba0215b67 100644
--- a/sys-cluster/galera/galera-25.3.10.ebuild
+++ b/sys-cluster/galera/galera-25.3.10.ebuild
@@ -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 @@ 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= )
@@ -49,8 +49,9 @@ src_prepare() {
 	# 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_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=(