mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 23:48:20 +00:00
python3-grpcio-tools: upgrade 1.69.0 -> 1.70.0
0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch refreshed for 1.70.0 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 5e19b63..61b30d8 100644
|
||||
index 1a997df..86e3ad1 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -90,9 +90,11 @@ def check_linker_need_libatomic():
|
||||
@@ -36,12 +36,12 @@ index 5e19b63..61b30d8 100644
|
||||
)
|
||||
- cxx = os.environ.get("CXX", "c++")
|
||||
- cpp_test = subprocess.Popen(
|
||||
- [cxx, "-x", "c++", "-std=c++14", "-"],
|
||||
- [cxx, "-x", "c++", "-std=c++17", "-"],
|
||||
+ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
|
||||
+ if not cxx_args:
|
||||
+ cxx_args = "-g"
|
||||
+
|
||||
+ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++14', '-'],
|
||||
+ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++17', '-'],
|
||||
stdin=PIPE,
|
||||
stdout=PIPE,
|
||||
stderr=PIPE,
|
||||
@@ -49,8 +49,11 @@ index 5e19b63..61b30d8 100644
|
||||
# Double-check to see if -latomic actually can solve the problem.
|
||||
# https://github.com/grpc/grpc/issues/22491
|
||||
cpp_test = subprocess.Popen(
|
||||
- [cxx, "-x", "c++", "-std=c++14", "-", "-latomic"],
|
||||
+ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'],
|
||||
- [cxx, "-x", "c++", "-std=c++17", "-", "-latomic"],
|
||||
+ [cxx, cxx_args, '-x', 'c++', '-std=c++17', '-', '-latomic'],
|
||||
stdin=PIPE,
|
||||
stdout=PIPE,
|
||||
stderr=PIPE,
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user