Merge branch '2.20' into backport-12095-to-2.20

DataDog · Feb 5, 2025 · 77e5b76 · 77e5b76
2 parents dd4d8a1 + 57910a7
commit 77e5b76
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ddtrace/internal/datadog/profiling/crashtracker/CMakeLists.txt b/ddtrace/internal/datadog/profiling/crashtracker/CMakeLists.txt
@@ -46,6 +46,10 @@ add_library(${EXTENSION_NAME} SHARED ${CRASHTRACKER_CPP_SRC})
 add_ddup_config(${EXTENSION_NAME})
 # Cython generates code that produces errors for the following, so relax compile options
 target_compile_options(${EXTENSION_NAME} PRIVATE -Wno-old-style-cast -Wno-shadow -Wno-address)
+# tp_print is marked deprecated in Python 3.8, but cython still generates code using it
+if("${Python3_VERSION_MINOR}" STREQUAL "8")
+    target_compile_options(${EXTENSION_NAME} PRIVATE -Wno-deprecated-declarations)
+endif()
 
 # cmake may mutate the name of the library (e.g., lib- and -.so for dynamic libraries). This suppresses that behavior,
 # which is required to ensure all paths can be inferred correctly by setup.py.

diff --git a/ddtrace/internal/datadog/profiling/ddup/CMakeLists.txt b/ddtrace/internal/datadog/profiling/ddup/CMakeLists.txt
@@ -49,6 +49,10 @@ add_library(${EXTENSION_NAME} SHARED ${DDUP_CPP_SRC})
 add_ddup_config(${EXTENSION_NAME})
 # Cython generates code that produces errors for the following, so relax compile options
 target_compile_options(${EXTENSION_NAME} PRIVATE -Wno-old-style-cast -Wno-shadow -Wno-address)
+# tp_print is marked deprecated in Python 3.8, but cython still generates code using it
+if("${Python3_VERSION_MINOR}" STREQUAL "8")
+    target_compile_options(${EXTENSION_NAME} PRIVATE -Wno-deprecated-declarations)
+endif()
 
 # cmake may mutate the name of the library (e.g., lib- and -.so for dynamic libraries). This suppresses that behavior,
 # which is required to ensure all paths can be inferred correctly by setup.py.