diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /textproc/difftastic/files/patch-jemalloc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'textproc/difftastic/files/patch-jemalloc')
| -rw-r--r-- | textproc/difftastic/files/patch-jemalloc | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/textproc/difftastic/files/patch-jemalloc b/textproc/difftastic/files/patch-jemalloc deleted file mode 100644 index f80eab3f65fa..000000000000 --- a/textproc/difftastic/files/patch-jemalloc +++ /dev/null @@ -1,29 +0,0 @@ -Upstream has switched from mimalloc to jemalloc in 0.64.0, but -tikv-jemallocator does not currently build on FreeBSD, so just -switch it to system allocator which is jemalloc anyway. ---- Cargo.toml.orig 2025-09-24 03:24:08 UTC -+++ Cargo.toml -@@ -110,7 +110,7 @@ tree-sitter-zig = "1.1.2" - tree-sitter-yaml = "0.7.0" - tree-sitter-zig = "1.1.2" - --[target.'cfg(not(any(target_env = "msvc", target_os = "illumos")))'.dependencies] -+[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies] - tikv-jemallocator = "0.6" - - [dev-dependencies] ---- src/main.rs.orig 2025-09-24 03:24:08 UTC -+++ src/main.rs -@@ -91,10 +91,10 @@ use crate::parse::syntax; - /// - /// For reference, Jemalloc uses 10-20% more time (although up to 33% - /// more instructions) when testing on sample files. --#[cfg(not(any(target_env = "msvc", target_os = "illumos")))] -+#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))] - use tikv_jemallocator::Jemalloc; - --#[cfg(not(any(target_env = "msvc", target_os = "illumos")))] -+#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))] - #[global_allocator] - static GLOBAL: Jemalloc = Jemalloc; - |
