Skip to content

Commit

Permalink
ripgrep: update to 4.1.1
Browse files Browse the repository at this point in the history
- Add patch to fix build on riscv64

Signed-off-by: Aleksey Vasilenko <[email protected]>
  • Loading branch information
krant authored and 1715173329 committed Sep 15, 2024
1 parent 7f976e1 commit f73bf31
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 2 deletions.
4 changes: 2 additions & 2 deletions utils/ripgrep/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=ripgrep
PKG_VERSION:=14.1.0
PKG_VERSION:=14.1.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/BurntSushi/ripgrep/tar.gz/$(PKG_VERSION)?
PKG_HASH:=33c6169596a6bbfdc81415910008f26e0809422fda2d849562637996553b2ab6
PKG_HASH:=4dad02a2f9c8c3c8d89434e47337aa654cb0e2aa50e806589132f186bf5c2b66

PKG_MAINTAINER:=Luca Barbato <[email protected]>
PKG_LICENSE:=MIT Unlicense
Expand Down
34 changes: 34 additions & 0 deletions utils/ripgrep/patches/010-fix-riscv64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 3c70b9a4900aab74c7643007e2b8127f9d016ed7 Mon Sep 17 00:00:00 2001
From: Aleksey Vasilenko <[email protected]>
Date: Thu, 12 Sep 2024 17:08:36 +0300
Subject: [PATCH] switch to tikv-jemallocator

---
Cargo.toml | 4 ++--
crates/core/main.rs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,8 +59,8 @@ serde_json = "1.0.23"
termcolor = "1.1.0"
textwrap = { version = "0.16.0", default-features = false }

-[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
-version = "0.5.0"
+[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.tikv-jemallocator]
+version = "0.6.0"

[dev-dependencies]
serde = "1.0.77"
--- a/crates/core/main.rs
+++ b/crates/core/main.rs
@@ -37,7 +37,7 @@ mod search;
// i686.
#[cfg(all(target_env = "musl", target_pointer_width = "64"))]
#[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;

/// Then, as it was, then again it will be.
fn main() -> ExitCode {

0 comments on commit f73bf31

Please sign in to comment.