All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2] package/ripgrep: new package
@ 2019-10-03  0:31 sam.voss at gmail.com
  2019-10-05 21:45 ` Thomas Petazzoni
  2019-10-06 15:56 ` Eric Le Bihan
  0 siblings, 2 replies; 5+ messages in thread
From: sam.voss at gmail.com @ 2019-10-03  0:31 UTC (permalink / raw)
  To: buildroot

From: Sam Voss <sam.voss@gmail.com>

Signed-off-by: Sam Voss <sam.voss@gmail.com>
---
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

diff --git a/DEVELOPERS b/DEVELOPERS
index ac73c7daa5..8aac60f93b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2077,6 +2077,9 @@ F:	package/urg/
 F:	package/ussp-push/
 F:	support/misc/toolchainfile.cmake.in
 
+N:	Sam Voss <sam.voss@gmail.com>
+F:	package/ripgrep/
+
 N:	Santosh Multhalli <santosh.multhalli@rockwellcollins.com>
 F:	package/valijson/
 
diff --git a/package/Config.in b/package/Config.in
index 4d8fce21c0..b17e04e86e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/ripgrep/Config.in b/package/ripgrep/Config.in
new file mode 100644
index 0000000000..5446ad046c
--- /dev/null
+++ b/package/ripgrep/Config.in
@@ -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
diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash
new file mode 100644
index 0000000000..0841c0185c
--- /dev/null
+++ b/package/ripgrep/ripgrep.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7035379fce0c1e32552e8ee528b92c3d01b8d3935ea31d26c51a73287be74bb3 ripgrep-0.8.1.tar.gz
+sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT
diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
new file mode 100644
index 0000000000..0bb7017a96
--- /dev/null
+++ b/package/ripgrep/ripgrep.mk
@@ -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))
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v2] package/ripgrep: new package
  2019-10-03  0:31 [Buildroot] [PATCH v2] package/ripgrep: new package sam.voss at gmail.com
@ 2019-10-05 21:45 ` Thomas Petazzoni
  2019-10-06 15:56 ` Eric Le Bihan
  1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2019-10-05 21:45 UTC (permalink / raw)
  To: buildroot

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

> From: Sam Voss <sam.voss@gmail.com>
> 
> Signed-off-by: Sam Voss <sam.voss@gmail.com>
> ---
> Changes v1 -> v2:
>   - Fix depends-on values
>   - Add hash for license files
>   - Make indentation consistant

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v2] package/ripgrep: new package
  2019-10-03  0:31 [Buildroot] [PATCH v2] package/ripgrep: new package sam.voss at gmail.com
  2019-10-05 21:45 ` Thomas Petazzoni
@ 2019-10-06 15:56 ` Eric Le Bihan
  2019-10-06 19:02   ` Sam Voss
  2019-10-07 20:59   ` Arnout Vandecappelle
  1 sibling, 2 replies; 5+ messages in thread
From: Eric Le Bihan @ 2019-10-06 15:56 UTC (permalink / raw)
  To: buildroot

Hi!

On 2019-10-02 19:31, sam.voss at gmail.com wrote:
> From: Sam Voss <sam.voss@gmail.com>
>
> Signed-off-by: Sam Voss <sam.voss@gmail.com>
> ---
> 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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v2] package/ripgrep: new package
  2019-10-06 15:56 ` Eric Le Bihan
@ 2019-10-06 19:02   ` Sam Voss
  2019-10-07 20:59   ` Arnout Vandecappelle
  1 sibling, 0 replies; 5+ messages in thread
From: Sam Voss @ 2019-10-06 19:02 UTC (permalink / raw)
  To: buildroot

Eric,

On Sun, Oct 6, 2019 at 10:56 AM Eric Le Bihan <eric.le.bihan.dev@free.fr> wrote:
>
> Hi!
>
> On 2019-10-02 19:31, sam.voss at gmail.com wrote:
> > From: Sam Voss <sam.voss@gmail.com>
> >
> > Signed-off-by: Sam Voss <sam.voss@gmail.com>
> > ---
> > 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

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

Sam

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] [PATCH v2] package/ripgrep: new package
  2019-10-06 15:56 ` Eric Le Bihan
  2019-10-06 19:02   ` Sam Voss
@ 2019-10-07 20:59   ` Arnout Vandecappelle
  1 sibling, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2019-10-07 20:59 UTC (permalink / raw)
  To: buildroot



On 06/10/2019 17:56, Eric Le Bihan wrote:
> Hi!
> 
> On 2019-10-02 19:31, sam.voss at gmail.com wrote:
>> From: Sam Voss <sam.voss@gmail.com>
>>
>> Signed-off-by: Sam Voss <sam.voss@gmail.com>
>> ---
>> 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?

 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


> 
> [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
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-10-07 20:59 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-03  0:31 [Buildroot] [PATCH v2] package/ripgrep: new package sam.voss at gmail.com
2019-10-05 21:45 ` Thomas Petazzoni
2019-10-06 15:56 ` Eric Le Bihan
2019-10-06 19:02   ` Sam Voss
2019-10-07 20:59   ` Arnout Vandecappelle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.