From fe1c8b732bd548b699d4c2ef725f67f8b8c8911c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 4 May 2018 11:22:40 +0100
Subject: gentoo resync : 04.05.2018

---
 sci-libs/Manifest.gz                        | Bin 41636 -> 41639 bytes
 sci-libs/tensorflow/Manifest                |   2 +-
 sci-libs/tensorflow/tensorflow-1.8.0.ebuild |  38 ++++++++++++++++++++--------
 3 files changed, 29 insertions(+), 11 deletions(-)

(limited to 'sci-libs')

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ad924f03fa81..994a52c04b95 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index e3b04f534cbb..eb7f4f3fa0da 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -41,5 +41,5 @@ DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513
 DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-EBUILD tensorflow-1.8.0.ebuild 12241 BLAKE2B c5eb08e2149f22ce291004153022adeca7f507732a06902e5a41a61f931718638afe6d36ecaad3321439520454c7905585d779c73e94138a65276f8423909898 SHA512 d55eacf7b07f495fa6115e4df1000e34be4c4024561320f77e0816c23570ecfb909c03864aaba89bc48749b677f811c2e670f9cd8a06d9f87ffe03925b739680
+EBUILD tensorflow-1.8.0.ebuild 12716 BLAKE2B 8545a75b7378b08f666cbdc0aa85d156f57b5995315c419c5f704cf9574987c2e7e61ba21a28f0f46c2824ba46c7b97662d0e998607c6967fdee9af326651653 SHA512 2d5f71375c8080f2c0103a442ab21dc4e55404b79cc6c3bdb27831ad905c9bd301821c33706c2949b400370e90ef70a8c4f5c6466a1aa1a1359162000981945f
 MISC metadata.xml 640 BLAKE2B 144684ba7084f37fabe0f6f89b18f75577ab847de50c4c42ea4ca74076f57f8e37469c45ed07001c537e079285cb4ed26eac0bd0169a7513576501ce53925555 SHA512 c57fa522651341c8bf9838ca7afc9dac6ae1597dc850382b255aab7e9b50d4b4eb92cdd0408d20dd9f737c1ee9b1ed7102e477c86693f7eeb498e75e51e19343
diff --git a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
index 9ab15ae9453c..c12a3e04ae05 100644
--- a/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.8.0.ebuild
@@ -103,6 +103,31 @@ PATCHES=(
 	"${FILESDIR}/0001-pip_package-modularize-build-script-to-allow-distros.patch"
 )
 
+bazel-get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
 setup_bazelrc() {
 	if [[ -f "${T}/bazelrc" ]]; then
 		return
@@ -118,7 +143,8 @@ setup_bazelrc() {
 	echo "startup --batch" > "${T}/bazelrc" || die
 
 	# make bazel respect $MAKEOPTS
-	echo "build --jobs=$(makeopts_jobs)" >> "${T}/bazelrc" || die
+	echo "build --jobs=$(makeopts_jobs) $(bazel-get-flags)" >> "${T}/bazelrc" || die
+	echo "build --compilation_mode=opt --host_compilation_mode=opt" >> "${T}/bazelrc" || die
 
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
@@ -187,16 +213,8 @@ src_prepare() {
 
 src_configure() {
 	do_configure() {
-		local cc_opt_flags=( ${CFLAGS} )
-
-		# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
-		for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
-			use cpu_flags_x86_${i} && cc_opt_flags+=( -m${i/_/.} )
-		done
-		use cpu_flags_x86_fma3 && cc_opt_flags+=( -mfma )
-
 		python_export PYTHON_SITEDIR
-		export CC_OPT_FLAGS="${cc_opt_flags[*]}"
+		export CC_OPT_FLAGS="${CFLAGS} $(bazel-get-cpu-flags)"
 		export GCC_HOST_COMPILER_PATH=$(tc-getCC)
 		export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
 		export TF_NEED_GCP=0
-- 
cgit v1.2.3