Skip to contentSkip to conversation

package/ripgrep: new package

PATCH Superseded sam.voss at gmail.com 4 participants 5 messages Oct 3, 2019 – Oct 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/ripgrep: new package

From: Sam Voss <[email protected]>

---
Changes v1 -> v2:
- Fix depends-on values
- Add hash for license files
- Make indentation consistant

 DEVELOPERS                   |  3 +++
 package/Config.in            |  1 +
 package/ripgrep/Config.in    | 14 ++++++++++++++
 package/ripgrep/ripgrep.hash |  3 +++
 package/ripgrep/ripgrep.mk   | 33 +++++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 package/ripgrep/Config.in
 create mode 100644 package/ripgrep/ripgrep.hash
 create mode 100644 package/ripgrep/ripgrep.mk
DEVELOPERS +3 -0
index ac73c7daa5..8aac60f93b 100644
@@ -2077,6 +2077,9 @@ F:	package/urg/
 F:	package/ussp-push/
 F:	support/misc/toolchainfile.cmake.in
 
+N:	Sam Voss <[email protected]>
+F:	package/ripgrep/
+
 N:	Santosh Multhalli <[email protected]>
 F:	package/valijson/
 
package/Config.in +1 -0
index 4d8fce21c0..b17e04e86e 100644
@@ -172,6 +172,7 @@ menu "Development tools"
 	source "package/make/Config.in"
 	source "package/patch/Config.in"
 	source "package/pkgconf/Config.in"
+	source "package/ripgrep/Config.in"
 	source "package/sed/Config.in"
 	source "package/subversion/Config.in"
 	source "package/tree/Config.in"
package/ripgrep/Config.in new file +14 -0
new file mode 100644
index 0000000000..5446ad046c
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_RIPGREP
+	bool "ripgrep"
+	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
+	select BR2_PACKAGE_HOST_CARGO
+	help
+	  ripgrep is a line-oriented search tool that
+	  recursively searches your current directory
+	  for a regex pattern while respecting your gitignore
+	  rules.
+
+	  ripgrep is similar to other popular search tools like
+	  The Silver Searcher, ack and grep.
+
+	  https://github.com/BurntSushi/ripgrep
package/ripgrep/ripgrep.hash new file +3 -0
new file mode 100644
index 0000000000..0841c0185c
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7035379fce0c1e32552e8ee528b92c3d01b8d3935ea31d26c51a73287be74bb3 ripgrep-0.8.1.tar.gz
+sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT
package/ripgrep/ripgrep.mk new file +33 -0
new file mode 100644
index 0000000000..0bb7017a96
@@ -0,0 +1,33 @@
+################################################################################
+#
+# ripgrep
+#
+################################################################################
+
+RIPGREP_VERSION = 0.8.1
+RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION))
+RIPGREP_LICENSE = MIT
+RIPGREP_LICENSE_FILES = LICENSE-MIT
+
+RIPGREP_DEPENDENCIES = host-cargo
+RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
+RIPGREP_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release)
+
+RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_MODE)
+
+RIPGREP_CARGO_OPTS = \
+	--$(RIPGREP_CARGO_MODE) \
+	--target=$(RUSTC_TARGET_NAME) \
+	--manifest-path=$(@D)/Cargo.toml
+
+define RIPGREP_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \
+		cargo build $(RIPGREP_CARGO_OPTS)
+endef
+
+define RIPGREP_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/$(RIPGREP_BIN_DIR)/rg \
+		$(TARGET_DIR)/usr/bin/rg
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.23.0
#1 lore raw

PATCH v2 1/1 package/ripgrep: new package

Quoted 8 lines · On Wed, 2 Oct 2019 19:31:46 -0500 sam.voss at gmail.com wrote:

From: Sam Voss <[email protected]>

---
Changes v1 -> v2:
- Fix depends-on values
- Add hash for license files
- Make indentation consistant

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/ripgrep: new package

In reply to sam.voss at gmail.com

Hi!

Quoted 8 lines · sam.voss at gmail.com

From: Sam Voss <[email protected]>

---
Changes v1 -> v2:
- Fix depends-on values
- Add hash for license files
- Make indentation consistant

A bit late, but LGTM. In my own version [1], I added '--jobs=$(PARALLEL_JOBS)' to $(RIPGREP_CARGO_OPTS), but in the end, it seems useless.

Now that there is one package using Cargo in Buildroot, should the pkg-cargo infrastructure be added?

[1] https://github.com/elebihan/br2-ext-rust/tree/master/package/ripgrep

Regards,

--
ELB

author
#3 lore raw

PATCH v2 1/1 package/ripgrep: new package

Eric,

Quoted 13 lines · Eric Le Bihan

Hi!

Quoted 8 lines · sam.voss at gmail.com

From: Sam Voss <[email protected]>

---
Changes v1 -> v2:
- Fix depends-on values
- Add hash for license files
- Make indentation consistant

Quoted 8 lines

A bit late, but LGTM. In my own version [1], I added '--jobs=$(PARALLEL_JOBS)' to $(RIPGREP_CARGO_OPTS), but in the end, it seems useless.

Now that there is one package using Cargo in Buildroot, should the pkg-cargo infrastructure be added?

[1] https://github.com/elebihan/br2-ext-rust/tree/master/package/ripgrep

It looks like this project is private. I went to take a look at it, and got a 404.

Sam

#4 lore raw

PATCH v2 1/1 package/ripgrep: new package

In reply to Eric Le Bihan
Quoted 12 lines · Eric Le Bihan

Hi!

Quoted 8 lines · sam.voss at gmail.com

From: Sam Voss <[email protected]>

---
Changes v1 -> v2:
- Fix depends-on values
- Add hash for license files
- Make indentation consistant

Quoted 6 lines

A bit late, but LGTM. In my own version [1], I added '--jobs=$(PARALLEL_JOBS)' to $(RIPGREP_CARGO_OPTS), but in the end, it seems useless.

Now that there is one package using Cargo in Buildroot, should the pkg-cargo infrastructure be added?

I would absolutely welcome pkg-cargo infrastructure. I would also welcome
additional rust packages.

However, before working on pkg-cargo infrastructure, I think it would be a good
idea to finish the rustc bump because I think it will (when done properly) simplify the rust/cargo infra a little bit.

Regards,
Arnout

Quoted 12 lines

[1] https://github.com/elebihan/br2-ext-rust/tree/master/package/ripgrep

Regards,

--
ELB
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot