Attachment #740454 for bug #787938




diff --git a/third_party/ruy/commit-3c93cda.patch b/third_party/ruy/commit-3c93cda.patch
new file mode 100644
index 00000000000..e530a842717
--- /dev/null
+++ b/third_party/ruy/commit-3c93cda.patch
@@ -0,0 +1,21 @@
+From 3c93cda8211efa01128d48950f0d6ee5233c5b9b Mon Sep 17 00:00:00 2001
+From: stha09 <51720730+stha09@users.noreply.github.com>
+Date: Thu, 6 May 2021 18:31:30 +0200
+Subject: [PATCH] IWYU: include limits for std::numeric_limits (#253)
+
+---
+ ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ruy/block_map.cc b/ruy/block_map.cc
+index 6c01e52a02..e04e7aff4a 100644
+--- a/ruy/block_map.cc
++++ b/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
diff --git a/third_party/ruy/workspace.bzl b/third_party/ruy/workspace.bzl
index 50769621770..7e91d640469 100644
--- a/third_party/ruy/workspace.bzl
+++ b/third_party/ruy/workspace.bzl
@@ -12,4 +12,5 @@ def repo():
             "https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip",
         ],
         build_file = "//third_party/ruy:BUILD",
+        patch_file = "//third_party/ruy:commit-3c93cda.patch"
     )

Lines 145-150 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" Link Here

(-)a/sci-libs/tensorflow/tensorflow-2.5.0-r1.ebuild (-2 / +6 lines)
145		145
146	S="${WORKDIR}/${MY_P}"	146	S="${WORKDIR}/${MY_P}"
147		147
		148	PATCHES=(
		149	"${FILESDIR}/0008-patch-ruy-for-gcc-11.patch"
		150	)
148	DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )	151	DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
149	CHECKREQS_MEMORY="5G"	152	CHECKREQS_MEMORY="5G"
150	CHECKREQS_DISK_BUILD="10G"	153	CHECKREQS_DISK_BUILD="10G"
Lines 187-192 src_prepare() { Link Here
187	export JAVA_HOME=$(java-config --jre-home) # so keepwork works	190	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
188		191
189	append-flags $(get-cpu-flags)	192	append-flags $(get-cpu-flags)
		193	append-cxxflags -std=c++14 # bug 787938
		194	filter-flags '-fvtable-verify=@(std\|preinit)'
190	bazel_setup_bazelrc	195	bazel_setup_bazelrc
191		196
192	eapply "${WORKDIR}"/patches/*.patch	197	eapply "${WORKDIR}"/patches/*.patch
Lines 356-362 src_compile() { Link Here
356	}	361	}
357		362
358	src_install() {	363	src_install() {
359	local i j	364	local i l
360	export JAVA_HOME=$(java-config --jre-home) # so keepwork works	365	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
361	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras	366	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
362		367
363	-

Return to bug 787938

Line 0 Link Here

(-)a/sci-libs/tensorflow/files/0008-patch-ruy-for-gcc-11.patch (+37 lines)
	1	diff --git a/third_party/ruy/commit-3c93cda.patch b/third_party/ruy/commit-3c93cda.patch
	2	new file mode 100644
	3	index 00000000000..e530a842717
	4	--- /dev/null
	5	+++ b/third_party/ruy/commit-3c93cda.patch
	6	@@ -0,0 +1,21 @@
	7	+From 3c93cda8211efa01128d48950f0d6ee5233c5b9b Mon Sep 17 00:00:00 2001
	8	+From: stha09 <51720730+stha09@users.noreply.github.com>
	9	+Date: Thu, 6 May 2021 18:31:30 +0200
	10	+Subject: [PATCH] IWYU: include limits for std::numeric_limits (#253)
	11	+
	12	+---
	13	+ ruy/block_map.cc \| 1 +
	14	+ 1 file changed, 1 insertion(+)
	15	+
	16	+diff --git a/ruy/block_map.cc b/ruy/block_map.cc
	17	+index 6c01e52a02..e04e7aff4a 100644
	18	+--- a/ruy/block_map.cc
	19	++++ b/ruy/block_map.cc
	20	+@@ -17,6 +17,7 @@ limitations under the License.
	21	+
	22	+ #include <algorithm>
	23	+ #include <cstdint>
	24	++#include <limits>
	25	+
	26	+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
	27	+ #include <cstdio>
	28	diff --git a/third_party/ruy/workspace.bzl b/third_party/ruy/workspace.bzl
	29	index 50769621770..7e91d640469 100644
	30	--- a/third_party/ruy/workspace.bzl
	31	+++ b/third_party/ruy/workspace.bzl
	32	@@ -12,4 +12,5 @@ def repo():
	33	"https://github.com/google/ruy/archive/54774a7a2cf85963777289193629d4bd42de4a59.zip",
	34	],
	35	build_file = "//third_party/ruy:BUILD",
	36	+ patch_file = "//third_party/ruy:commit-3c93cda.patch"
	37	)