[Buildroot] [git commit branch/2020.05.x] package/ripgrep: fix build directories
Peter Korsgaard
peter at korsgaard.com
Fri Aug 28 17:28:42 UTC 2020
commit: https://git.buildroot.net/buildroot/commit/?id=ddb90ca84cdae9a809994318116d666808c60777
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.05.x
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 at gmail.com>
CC: Yann E. MORIN <yann.morin.1998 at free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
(cherry picked from commit 32d27c2f4c47f4da97a484a37df8b0ba1743b0d2)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
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 2cfdeba9aa..1500733d09 100644
--- a/package/ripgrep/ripgrep.mk
+++ b/package/ripgrep/ripgrep.mk
@@ -12,13 +12,19 @@ RIPGREP_LICENSE_FILES = LICENSE-MIT
RIPGREP_DEPENDENCIES = host-cargo
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)
More information about the buildroot
mailing list