mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02: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:
parent
8186353598
commit
f945cda4e7
|
@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
diff --git a/setup.py b/setup.py
|
||||||
index 5e19b63..61b30d8 100644
|
index 1a997df..86e3ad1 100644
|
||||||
--- a/setup.py
|
--- a/setup.py
|
||||||
+++ b/setup.py
|
+++ b/setup.py
|
||||||
@@ -90,9 +90,11 @@ def check_linker_need_libatomic():
|
@@ -90,9 +90,11 @@ def check_linker_need_libatomic():
|
||||||
|
@ -36,12 +36,12 @@ index 5e19b63..61b30d8 100644
|
||||||
)
|
)
|
||||||
- cxx = os.environ.get("CXX", "c++")
|
- cxx = os.environ.get("CXX", "c++")
|
||||||
- cpp_test = subprocess.Popen(
|
- 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++'
|
+ cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
|
||||||
+ if not cxx_args:
|
+ if not cxx_args:
|
||||||
+ cxx_args = "-g"
|
+ 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,
|
stdin=PIPE,
|
||||||
stdout=PIPE,
|
stdout=PIPE,
|
||||||
stderr=PIPE,
|
stderr=PIPE,
|
||||||
|
@ -49,8 +49,11 @@ index 5e19b63..61b30d8 100644
|
||||||
# Double-check to see if -latomic actually can solve the problem.
|
# Double-check to see if -latomic actually can solve the problem.
|
||||||
# https://github.com/grpc/grpc/issues/22491
|
# https://github.com/grpc/grpc/issues/22491
|
||||||
cpp_test = subprocess.Popen(
|
cpp_test = subprocess.Popen(
|
||||||
- [cxx, "-x", "c++", "-std=c++14", "-", "-latomic"],
|
- [cxx, "-x", "c++", "-std=c++17", "-", "-latomic"],
|
||||||
+ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'],
|
+ [cxx, cxx_args, '-x', 'c++', '-std=c++17', '-', '-latomic'],
|
||||||
stdin=PIPE,
|
stdin=PIPE,
|
||||||
stdout=PIPE,
|
stdout=PIPE,
|
||||||
stderr=PIPE,
|
stderr=PIPE,
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ DEPENDS += "python3-grpcio"
|
||||||
SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
|
SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
|
||||||
file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \
|
file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "3e1a98f4d9decb84979e1ddd3deb09c0a33a84b6e3c0776d5bde4097e3ab66dd"
|
SRC_URI[sha256sum] = "e578fee7c1c213c8e471750d92631d00f178a15479fb2cb3b939a07fc125ccd3"
|
||||||
|
|
||||||
RDEPENDS:${PN} = "python3-grpcio"
|
RDEPENDS:${PN} = "python3-grpcio"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user