devel/py-ddtrace: Update to 2.21.5

- Clean up BUILD_DEPENDS after 1065f238d9
- Silence patch message

Changes:	https://github.com/DataDog/dd-trace-py/releases
This commit is contained in:
Po-Chuan Hsieh 2025-04-18 13:15:19 +08:00
parent 517ee0ebc7
commit 3cfe50c9b9
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
5 changed files with 46 additions and 19 deletions

View file

@ -1,6 +1,5 @@
PORTNAME= ddtrace
PORTVERSION= 2.21.3
PORTREVISION= 2
PORTVERSION= 2.21.5
CATEGORIES= devel python
MASTER_SITES= PYPI \
https://github.com/abseil/abseil-cpp/releases/download/${ABSEIL_VERSION}/:abseil
@ -18,8 +17,7 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.Apache
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.BSD3
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools-rust>=0<2:devel/py-setuptools-rust@${PY_FLAVOR} \
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=0<2:devel/py-setuptools-rust@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools-scm>=4:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
LIB_DEPENDS= libddwaf.so:devel/libddwaf
@ -54,7 +52,7 @@ OPENAI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tiktoken>=0:textproc/py-tiktoken@${PY
OPENTRACING_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}opentracing>=2.0.0:devel/py-opentracing@${PY_FLAVOR}
post-patch:
${MV} ${WRKDIR}/abseil-cpp-${ABSEIL_VERSION}/ ${WRKSRC}/ddtrace/appsec/_iast/_taint_tracking/absl/
@${MV} ${WRKDIR}/abseil-cpp-${ABSEIL_VERSION}/ ${WRKSRC}/ddtrace/appsec/_iast/_taint_tracking/absl/
post-install:
${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

View file

@ -1,6 +1,6 @@
TIMESTAMP = 1742405472
SHA256 (ddtrace-2.21.3.tar.gz) = 07f247928943d1ac7523d68f3629bec240a29d5a51b144d29513513d303e199b
SIZE (ddtrace-2.21.3.tar.gz) = 8798508
TIMESTAMP = 1744288878
SHA256 (ddtrace-2.21.5.tar.gz) = 92632507ce1b763aea98414ada4f5ea08bdba90a40f9541094213fe703e7830f
SIZE (ddtrace-2.21.5.tar.gz) = 9300302
SHA256 (abseil-cpp-20250127.1.tar.gz) = b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811
SIZE (abseil-cpp-20250127.1.tar.gz) = 2267282
SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da

View file

@ -1,12 +1,21 @@
--- ddtrace/appsec/_iast/_taint_tracking/CMakeLists.txt.orig 2024-10-30 14:03:55 UTC
--- ddtrace/appsec/_iast/_taint_tracking/CMakeLists.txt.orig 2025-04-07 19:46:51 UTC
+++ ddtrace/appsec/_iast/_taint_tracking/CMakeLists.txt
@@ -32,8 +32,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
@@ -3,7 +3,7 @@ option(BUILD_MACOS "Build for MacOS" OFF)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
message("Release mode: using abseil")
set(APP_NAME _native)
option(BUILD_MACOS "Build for MacOS" OFF)
-option(NATIVE_TESTING "Load test subdirectories and targets" ON)
+option(NATIVE_TESTING "Load test subdirectories and targets" OFF)
project(${APP_NAME})
@@ -45,8 +45,7 @@ else()
add_definitions(-DDONT_COMPILE_ABSEIL) # Define DONT_COMPILE_ABSEIL preprocessor variable
else()
message("Release mode: using abseil (DD_COMPILE_ABSEIL unset or not 0/false)")
- FetchContent_Declare(absl URL "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.zip")
- FetchContent_MakeAvailable(absl)
+ add_subdirectory(absl)
else()
message("Debug mode: not using abseil")
endif()
include_directories(".")

View file

@ -1,4 +1,4 @@
--- pyproject.toml.orig 2024-08-01 21:44:33 UTC
--- pyproject.toml.orig 2025-04-07 19:46:51 UTC
+++ pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
@ -7,3 +7,12 @@
build-backend = "setuptools.build_meta"
[project]
@@ -30,7 +30,7 @@ dependencies = [
"bytecode>=0.15.0; python_version~='3.12.0'",
"bytecode>=0.14.0; python_version~='3.11.0'",
"bytecode>=0.13.0; python_version<'3.11'",
- "envier==0.5.2",
+ "envier>=0.5.2",
"importlib_metadata<=6.5.0; python_version<'3.8'",
"legacy-cgi>=2.0.0; python_version>='3.13.0'",
"opentelemetry-api>=1",

View file

@ -1,14 +1,25 @@
--- setup.py.orig 2024-08-01 21:44:34 UTC
--- setup.py.orig 2025-04-07 19:46:51 UTC
+++ setup.py
@@ -8,7 +8,6 @@ import tarfile
import sysconfig
@@ -9,7 +9,6 @@ import time
import tarfile
import time
-import cmake
from setuptools_rust import Binding
from setuptools_rust import RustExtension
@@ -495,10 +494,9 @@ setup(
@@ -419,9 +418,7 @@ class CMakeBuild(build_ext):
"-DCMAKE_C_FLAGS_%s=-O0" % ext.build_type.upper(),
"-DCMAKE_CXX_FLAGS_%s=-O0" % ext.build_type.upper(),
]
- cmake_command = (
- Path(cmake.CMAKE_BIN_DIR) / "cmake"
- ).resolve() # explicitly use the cmake provided by the cmake package
+ cmake_command = "cmake"
subprocess.run([cmake_command, *cmake_args], cwd=cmake_build_dir, check=True)
subprocess.run([cmake_command, "--build", ".", *build_args], cwd=cmake_build_dir, check=True)
subprocess.run([cmake_command, "--install", ".", *install_args], cwd=cmake_build_dir, check=True)
@@ -661,10 +658,9 @@ setup(
# funcsigs backport required for vendored debtcollector
cmdclass={
"build_ext": CMakeBuild,