diff mbox series

[meta-python,40/66] python3-grpcio-tools: upgrade 1.69.0 -> 1.70.0

Message ID 1739178095-26432-40-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-webserver,01/66] apache2: upgrade 2.4.62 -> 2.4.63 | expand

Commit Message

Mingyu Wang (Fujitsu) Feb. 10, 2025, 9:01 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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>
---
 ...tup.py-Do-not-mix-C-and-C-compiler-options.patch | 13 ++++++++-----
 ...ols_1.69.0.bb => python3-grpcio-tools_1.70.0.bb} |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.69.0.bb => python3-grpcio-tools_1.70.0.bb} (86%)
diff mbox series

Patch

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 5366a1e1cf..439b337bda 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
@@ -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
+
diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb
similarity index 86%
rename from meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb
rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb
index 76f5739f95..e295e0329e 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb
@@ -15,7 +15,7 @@  DEPENDS += "python3-grpcio"
 SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
             file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \
             "
-SRC_URI[sha256sum] = "3e1a98f4d9decb84979e1ddd3deb09c0a33a84b6e3c0776d5bde4097e3ab66dd"
+SRC_URI[sha256sum] = "e578fee7c1c213c8e471750d92631d00f178a15479fb2cb3b939a07fc125ccd3"
 
 RDEPENDS:${PN} = "python3-grpcio"