1 |
commit: 0ff6a32f5ca325f48d9a7ffab4ce59ec523d5813 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 28 22:10:04 2022 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 28 22:21:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff6a32f |
7 |
|
8 |
dev-python/grpcio: re-add CC patch in 1.51.0 |
9 |
|
10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
11 |
|
12 |
dev-python/grpcio/files/1.51.0-respect-cc.patch | 28 +++++++++++++++++++++++++ |
13 |
dev-python/grpcio/grpcio-1.51.0.ebuild | 2 +- |
14 |
2 files changed, 29 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-python/grpcio/files/1.51.0-respect-cc.patch b/dev-python/grpcio/files/1.51.0-respect-cc.patch |
17 |
new file mode 100644 |
18 |
index 000000000000..8a2c8313aa8f |
19 |
--- /dev/null |
20 |
+++ b/dev-python/grpcio/files/1.51.0-respect-cc.patch |
21 |
@@ -0,0 +1,28 @@ |
22 |
+From 209e9e0c21dd5bdf62d943dfd9caca40565734b5 Mon Sep 17 00:00:00 2001 |
23 |
+From: Georgy Yakovlev <gyakovlev@g.o> |
24 |
+Date: Mon, 28 Nov 2022 14:08:17 -0800 |
25 |
+Subject: [PATCH] respect CC variable |
26 |
+ |
27 |
+https://github.com/grpc/grpc/pull/26480 |
28 |
+Signed-off-by: Georgy Yakovlev <gyakovlev@g.o> |
29 |
+--- |
30 |
+ src/python/grpcio/commands.py | 3 ++- |
31 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py |
34 |
+index 58ab57be47..6d8228ffa0 100644 |
35 |
+--- a/src/python/grpcio/commands.py |
36 |
++++ b/src/python/grpcio/commands.py |
37 |
+@@ -228,7 +228,8 @@ class BuildExt(build_ext.build_ext): |
38 |
+ """ |
39 |
+ try: |
40 |
+ # TODO(lidiz) Remove the generated a.out for success tests. |
41 |
+- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'], |
42 |
++ cc = os.environ.get('CC', 'cc') |
43 |
++ cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'], |
44 |
+ stdin=subprocess.PIPE, |
45 |
+ stdout=subprocess.PIPE, |
46 |
+ stderr=subprocess.PIPE) |
47 |
+-- |
48 |
+2.38.1 |
49 |
+ |
50 |
|
51 |
diff --git a/dev-python/grpcio/grpcio-1.51.0.ebuild b/dev-python/grpcio/grpcio-1.51.0.ebuild |
52 |
index e0957a3fca22..316ccdb61a70 100644 |
53 |
--- a/dev-python/grpcio/grpcio-1.51.0.ebuild |
54 |
+++ b/dev-python/grpcio/grpcio-1.51.0.ebuild |
55 |
@@ -28,7 +28,7 @@ RDEPEND=" |
56 |
|
57 |
DEPEND="${RDEPEND}" |
58 |
|
59 |
-PATCHES=( "${FILESDIR}/1.37.1-cc-flag-test-fix.patch" ) |
60 |
+PATCHES=( "${FILESDIR}/1.51.0-respect-cc.patch" ) |
61 |
|
62 |
python_prepare_all() { |
63 |
distutils-r1_python_prepare_all |