diff mbox series

[meta-python,4/9] python3-grpcio: use system zlib

Message ID 20250206191903.2324783-4-peter.marko@siemens.com
State Accepted
Headers show
Series [meta-python,1/9] python3-grpcio: drop obsolete variable | expand

Commit Message

Peter Marko Feb. 6, 2025, 7:18 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

This also allows to remove a custom patch to maintain and corrects
license, SPDX and CVE handling.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 ...clude-unistd.h-for-open-close-C-APIs.patch | 24 -------------------
 .../python/python3-grpcio_1.69.0.bb           |  4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
deleted file mode 100644
index 584723e6d1..0000000000
--- a/meta-python/recipes-devtools/python/python3-grpcio/0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-From f84421d8ee06890e2c98c0f7c9ec6c73f88e77c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Feb 2023 21:25:04 -0800
-Subject: [PATCH] zlib: Include unistd.h for open/close C APIs
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- third_party/zlib/gzguts.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/third_party/zlib/gzguts.h b/third_party/zlib/gzguts.h
-index f937504..341a68d 100644
---- a/third_party/zlib/gzguts.h
-+++ b/third_party/zlib/gzguts.h
-@@ -18,6 +18,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <unistd.h>
- #include "zlib.h"
- #ifdef STDC
- #  include <string.h>
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb
index 32d4fbc22a..d621f840f1 100644
--- a/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb
+++ b/meta-python/recipes-devtools/python/python3-grpcio_1.69.0.bb
@@ -4,12 +4,11 @@  SECTION = "devel/python"
 LICENSE = "Apache-2.0 & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906"
 
-DEPENDS += "openssl python3-protobuf"
+DEPENDS += "openssl python3-protobuf zlib"
 
 SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \
            file://0001-Include-missing-cstdint-header.patch \
            file://abseil-ppc-fixes.patch \
-           file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \
            "
 SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5"
 
@@ -21,6 +20,7 @@  inherit pypi
 CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE"
 
 export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1"
+export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1"
 
 GRPC_CFLAGS ?= ""
 GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions"