diff --git a/devel/libdatadog/files/patch-builder-src-arch-mod.rs b/devel/libdatadog/files/patch-builder-src-arch-mod.rs index aea1c9a20c79..7da4e4cfa458 100644 --- a/devel/libdatadog/files/patch-builder-src-arch-mod.rs +++ b/devel/libdatadog/files/patch-builder-src-arch-mod.rs @@ -1,13 +1,11 @@ ---- builder/src/arch/mod.rs.orig 2025-02-11 17:46:31 UTC -+++ builder/src/arch/mod.rs -@@ -28,3 +28,10 @@ pub use crate::arch::windows::*; +--- builder/src/arch/mod.rs.orig 2025-11-24 20:38:29.000000000 +0100 ++++ builder/src/arch/mod.rs 2026-05-21 11:08:08.882738000 +0200 +@@ -28,3 +28,8 @@ #[cfg(any(target_arch = "x86_64", target_arch = "x86"))] #[cfg(target_os = "windows")] pub use crate::arch::windows::*; + -+#[cfg(any(target_arch = "x86_64", target_arch = "x86"))] +#[cfg(target_os = "freebsd")] +pub mod freebsd; -+#[cfg(any(target_arch = "x86_64", target_arch = "x86"))] +#[cfg(target_os = "freebsd")] +pub use crate::arch::freebsd::*; diff --git a/devel/libdatadog/files/patch-cargo-crates_aws-lc-sys-0.28.0_aws-lc_crypto_fipsmodule_cpucap_cpu__ppc64le.c b/devel/libdatadog/files/patch-cargo-crates_aws-lc-sys-0.28.0_aws-lc_crypto_fipsmodule_cpucap_cpu__ppc64le.c new file mode 100644 index 000000000000..cd6fbf65a352 --- /dev/null +++ b/devel/libdatadog/files/patch-cargo-crates_aws-lc-sys-0.28.0_aws-lc_crypto_fipsmodule_cpucap_cpu__ppc64le.c @@ -0,0 +1,14 @@ +--- cargo-crates/aws-lc-sys-0.28.0/aws-lc/crypto/fipsmodule/cpucap/cpu_ppc64le.c.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/aws-lc-sys-0.28.0/aws-lc/crypto/fipsmodule/cpucap/cpu_ppc64le.c +@@ -69,7 +69,11 @@ void OPENSSL_cpuid_setup(void) { + + void OPENSSL_cpuid_setup(void) { + #if defined(AT_HWCAP2) ++#ifdef __linux__ + OPENSSL_ppc64le_hwcap2 = getauxval(AT_HWCAP2); ++#elif defined(__FreeBSD__) ++ elf_aux_info(AT_HWCAP2, &OPENSSL_ppc64le_hwcap2, sizeof(OPENSSL_ppc64le_hwcap2)); ++#endif + #else + OPENSSL_ppc64le_hwcap2 = 0; + #endif diff --git a/devel/libdatadog/files/patch-cargo-crates_aws-lc-sys-0.28.0_aws-lc_include_openssl_target.h b/devel/libdatadog/files/patch-cargo-crates_aws-lc-sys-0.28.0_aws-lc_include_openssl_target.h new file mode 100644 index 000000000000..8eca3258c657 --- /dev/null +++ b/devel/libdatadog/files/patch-cargo-crates_aws-lc-sys-0.28.0_aws-lc_include_openssl_target.h @@ -0,0 +1,20 @@ +--- cargo-crates/aws-lc-sys-0.28.0/aws-lc/include/openssl/target.h.orig 2025-09-03 10:05:29 UTC ++++ cargo-crates/aws-lc-sys-0.28.0/aws-lc/include/openssl/target.h +@@ -34,14 +34,14 @@ + #elif defined(__ARMEL__) || defined(_M_ARM) + #define OPENSSL_32_BIT + #define OPENSSL_ARM +-#elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN) ++#elif (defined(__PPC64__) || defined(__powerpc64__)) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define OPENSSL_64_BIT + #define OPENSSL_PPC64LE +-#elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_BIG_ENDIAN) ++#elif (defined(__PPC64__) || defined(__powerpc64__)) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + #define OPENSSL_64_BIT + #define OPENSSL_PPC64BE + #define OPENSSL_BIG_ENDIAN +-#elif (defined(__PPC__) || defined(__powerpc__)) && defined(_BIG_ENDIAN) ++#elif (defined(__PPC__) || defined(__powerpc__)) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + #define OPENSSL_32_BIT + #define OPENSSL_PPC32BE + #define OPENSSL_BIG_ENDIAN diff --git a/devel/libdatadog/files/patch-datadog-sidecar_Cargo.toml b/devel/libdatadog/files/patch-datadog-sidecar_Cargo.toml new file mode 100644 index 000000000000..58878506d49a --- /dev/null +++ b/devel/libdatadog/files/patch-datadog-sidecar_Cargo.toml @@ -0,0 +1,11 @@ +--- datadog-sidecar/Cargo.toml.orig 2026-05-21 10:59:02.642121000 +0200 ++++ datadog-sidecar/Cargo.toml 2026-05-21 10:59:02.649190000 +0200 +@@ -70,7 +70,7 @@ + # watchdog and self telemetry + memory-stats = { version = "1.2.0", features = ["always_use_statm"] } + +-[dependencies.windows] ++[target.'cfg(windows)'.dependencies.windows] + features = [ + "Win32_Foundation", + "Wdk_Storage_FileSystem", diff --git a/devel/libdatadog/files/patch-libdd-crashtracker-src-collector-emitters.rs b/devel/libdatadog/files/patch-libdd-crashtracker-src-collector-emitters.rs index 9bfb47ff129d..3e65c47a9660 100644 --- a/devel/libdatadog/files/patch-libdd-crashtracker-src-collector-emitters.rs +++ b/devel/libdatadog/files/patch-libdd-crashtracker-src-collector-emitters.rs @@ -1,23 +1,25 @@ ---- libdd-crashtracker/src/collector/emitters.rs.orig 2025-11-03 12:41:37 UTC -+++ libdd-crashtracker/src/collector/emitters.rs -@@ -198,7 +198,7 @@ fn emit_proc_self_maps(w: &mut impl Write) -> Result<( +--- libdd-crashtracker/src/collector/emitters.rs.orig 2025-11-24 20:38:29.000000000 +0100 ++++ libdd-crashtracker/src/collector/emitters.rs 2026-05-21 11:19:15.044623000 +0200 +@@ -207,7 +207,7 @@ Ok(()) } -#[cfg(target_os = "linux")] +#[cfg(any(target_os = "freebsd", target_os = "linux"))] fn emit_ucontext(w: &mut impl Write, ucontext: *const ucontext_t) -> Result<(), EmitterError> { if ucontext.is_null() { return Err(EmitterError::NullUcontext); -@@ -325,6 +325,11 @@ fn extract_ip(ucontext: *const ucontext_t) -> usize { - return (*(*ucontext).uc_mcontext).__ss.__rip as usize; +@@ -380,6 +380,13 @@ #[cfg(all(target_os = "macos", target_arch = "aarch64"))] return (*(*ucontext).uc_mcontext).__ss.__pc as usize; -+ + + #[cfg(all(target_os = "freebsd", target_arch = "x86_64"))] + return (*ucontext).uc_mcontext.mc_rip as usize; + #[cfg(all(target_os = "freebsd", target_arch = "aarch64"))] + return (*ucontext).uc_mcontext.mc_gpregs.gp_pc; - ++ #[cfg(all(target_os = "freebsd", target_arch = "powerpc64"))] ++ return (*ucontext).uc_mcontext.mc_frame[36] as usize; ++ #[cfg(all(target_os = "linux", target_arch = "x86_64"))] return (*ucontext).uc_mcontext.gregs[libc::REG_RIP as usize] as usize; + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] diff --git a/devel/libdatadog/files/patch-spawn__worker_Cargo.toml b/devel/libdatadog/files/patch-spawn__worker_Cargo.toml new file mode 100644 index 000000000000..25b4213b59be --- /dev/null +++ b/devel/libdatadog/files/patch-spawn__worker_Cargo.toml @@ -0,0 +1,11 @@ +--- spawn_worker/Cargo.toml.orig 2026-05-21 10:59:02.522202000 +0200 ++++ spawn_worker/Cargo.toml 2026-05-21 10:59:02.528203000 +0200 +@@ -15,7 +15,7 @@ + [build-dependencies] + cc_utils = { path = "../tools/cc_utils" } + +-[dependencies.windows] ++[target.'cfg(windows)'.dependencies.windows] + features = [ + "Win32_Foundation", + "Win32_Security",