From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/ripgrep: fix build directories
Date: Thu, 27 Aug 2020 09:58:52 +0200 [thread overview]
Message-ID: <20200827075852.GA14874@scaer> (raw)
In-Reply-To: <20200827004424.325134-1-sam.voss@gmail.com>
Sam, All,
On 2020-08-26 19:44 -0500, sam.voss at gmail.com spake thusly:
> From: Sam Voss <sam.voss@gmail.com>
>
> RIPGREP_CARGO_MODE was no longer defined after 832c076f26 and caused
> issues during the install step as the build directory was malformed.
>
> This patch maintains the release/dev profile distinction, while also
> assigning appropriate build folders.
>
> Fixes:
> - http://autobuild.buildroot.net/results/a4cd7ecc6d983aa6f15d3be1e21529f17e04b825/
> - http://autobuild.buildroot.net/results/2bab8ffa590d4c4eabffe94ed27311c7f6607c98/
>
> Signed-off-by: Sam Voss <sam.voss@gmail.com>
> CC: Yann E. MORIN <yann.morin.1998@free.fr>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/ripgrep/ripgrep.mk | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
> index 5f58630ffe..9dd8d58de1 100644
> --- a/package/ripgrep/ripgrep.mk
> +++ b/package/ripgrep/ripgrep.mk
> @@ -12,13 +12,19 @@ RIPGREP_LICENSE_FILES = LICENSE-MIT
> RIPGREP_DEPENDENCIES = host-rustc
> RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
>
> -RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_MODE)
> +RIPGREP_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(RIPGREP_CARGO_BIN_SUBDIR)
>
> RIPGREP_CARGO_OPTS = \
> - $(if $(BR2_ENABLE_DEBUG),,--release) \
> --target=$(RUSTC_TARGET_NAME) \
> --manifest-path=$(@D)/Cargo.toml
>
> +ifeq ($(BR2_ENABLE_DEBUG),y)
> +RIPGREP_CARGO_BIN_SUBDIR = debug
> +else
> +RIPGREP_CARGO_OPTS += --release
> +RIPGREP_CARGO_BIN_SUBDIR = release
> +endif
> +
> define RIPGREP_BUILD_CMDS
> $(TARGET_MAKE_ENV) $(RIPGREP_CARGO_ENV) \
> cargo build $(RIPGREP_CARGO_OPTS)
> --
> 2.27.0
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-08-27 7:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 0:44 [Buildroot] [PATCH] package/ripgrep: fix build directories sam.voss at gmail.com
2020-08-27 7:58 ` Yann E. MORIN [this message]
2020-08-28 17:29 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200827075852.GA14874@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.