From 79c71335803d8859eb419c208aa3f66722d54fc4 Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Thu, 7 Jul 2022 15:55:05 +0800 Subject: python3-grpcio-tools: upgrade 1.46.3 -> 1.47.0 0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch refreshed for new version. Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- ...1-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 13 +++++++++---- .../python/python3-grpcio-tools_1.46.3.bb | 17 ----------------- .../python/python3-grpcio-tools_1.47.0.bb | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 4713da174f..4aa11bd57a 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -26,6 +26,8 @@ Signed-off-by: Khem Raj setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) +diff --git a/setup.py b/setup.py +index cc53e79..be3bc78 100644 --- a/setup.py +++ b/setup.py @@ -87,8 +87,11 @@ def check_linker_need_libatomic(): @@ -33,12 +35,12 @@ Signed-off-by: Khem Raj code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') - cxx = os.environ.get('CXX', 'c++') -- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++14', '-'], + 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++11', '-'], ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++14', '-'], stdin=PIPE, stdout=PIPE, stderr=PIPE) @@ -46,8 +48,11 @@ Signed-off-by: Khem Raj # 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++11', '-', '-latomic'], -+ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-', '-latomic'], +- [cxx, '-x', 'c++', '-std=c++14', '-', '-latomic'], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'], stdin=PIPE, stdout=PIPE, stderr=PIPE) +-- +2.25.1 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb deleted file mode 100644 index 221a05ef1a..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Google gRPC tools" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-grpcio" - -SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI[sha256sum] = "31fee436ace5b3bd950cc3a8e68d6b84de1d6dc755959db7badc3470cdf22f70" - -RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb new file mode 100644 index 0000000000..90c8efeeca --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Google gRPC tools" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-grpcio" + +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" +SRC_URI[sha256sum] = "f64b5378484be1d6ce59311f86174be29c8ff98d8d90f589e1c56d5acae67d3c" + +RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf