python3-grpcio: use system re2

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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Peter Marko
2025-02-06 20:19:00 +01:00
committed by Khem Raj
parent bd8570dba0
commit 3fdbefe915
2 changed files with 2 additions and 31 deletions

View File

@@ -1,29 +0,0 @@
From 0760579b4890b48ea3ab36e48f1f6fb3e7ed05f5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 30 Jan 2023 10:31:10 -0800
Subject: [PATCH] Include missing <cstdint> header
gcc 13 moved some includes around and as a result <cstdint> is
no longer transitively included [1]. Explicitly include it for
int32_t.
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
third_party/re2/util/pcre.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h
index 896b0bd..271a005 100644
--- a/third_party/re2/util/pcre.h
+++ b/third_party/re2/util/pcre.h
@@ -163,6 +163,7 @@
#include "util/util.h"
#include "re2/stringpiece.h"
+#include <cstdint>
#ifdef USEPCRE
#include <pcre.h>

View File

@@ -4,10 +4,9 @@ SECTION = "devel/python"
LICENSE = "Apache-2.0 & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906"
DEPENDS += "c-ares openssl python3-protobuf zlib"
DEPENDS += "c-ares openssl python3-protobuf re2 zlib"
SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \
file://0001-Include-missing-cstdint-header.patch \
file://abseil-ppc-fixes.patch \
"
SRC_URI[sha256sum] = "936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5"
@@ -21,6 +20,7 @@ CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE"
export GRPC_PYTHON_BUILD_SYSTEM_CARES = "1"
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1"
export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1"
export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1"
GRPC_CFLAGS ?= ""