diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index f416ca272..1f465dbb6 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -23,16 +23,17 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Khem Raj Signed-off-by: Hongxu Jia +Signed-off-by: Wang Mingyu --- - setup.py | 9 ++++++--- - src/python/grpcio/commands.py | 5 ++++- - 2 files changed, 10 insertions(+), 4 deletions(-) + setup.py | 11 +++++++---- + src/python/grpcio/commands.py | 5 ++++- + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py -index ec27fe4..b2d2d1a 100644 +index 3a50c97..bb2386d 100644 --- a/setup.py +++ b/setup.py -@@ -206,8 +206,11 @@ def check_linker_need_libatomic(): +@@ -205,8 +205,11 @@ def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') @@ -46,15 +47,17 @@ index ec27fe4..b2d2d1a 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE) -@@ -217,7 +220,7 @@ def check_linker_need_libatomic(): +@@ -215,8 +218,8 @@ def check_linker_need_libatomic(): + return False # 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'], - stdin=PIPE, - stdout=PIPE, - stderr=PIPE) +- cpp_test = subprocess.Popen(cxx + +- ['-x', 'c++', '-std=c++14', '-', '-latomic'], ++ cpp_test = subprocess.Popen( ++ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE) diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index d93b6c7..a8c4a51 100644 --- a/src/python/grpcio/commands.py diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.48.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.49.0.bb similarity index 93% rename from meta-python/recipes-devtools/python/python3-grpcio_1.48.1.bb rename to meta-python/recipes-devtools/python/python3-grpcio_1.49.0.bb index b2ca35154..c3266e5d2 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.48.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.49.0.bb @@ -12,7 +12,7 @@ SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ file://mips_bigendian.patch \ file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ " -SRC_URI[sha256sum] = "660217eccd2943bf23ea9a36e2a292024305aec04bf747fbcff1f5032b83610e" +SRC_URI[sha256sum] = "90ec337f36db26fbc70a4c032bcbabb2008f950f4194e99385118a12688fdf92" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \