Skip to contentSkip to conversation

package/ripgrep: fix build directories

PATCH New sam.voss at gmail.com 3 participants 3 messages Aug 27, 2020 – Aug 28, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/ripgrep: fix build directories

From: Sam Voss <[email protected]>

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/

CC Yann E. MORIN <[email protected]>
---
 package/ripgrep/ripgrep.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
package/ripgrep/ripgrep.mk +8 -2
index 5f58630ffe..9dd8d58de1 100644
@@ -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)
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/ripgrep: fix build directories

Sam, All,

On 2020-08-26 19:44 -0500, sam.voss at gmail.com spake thusly:

Quoted 8 lines

From: Sam Voss <[email protected]>

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.

Quoted 6 lines

Fixes:
- http://autobuild.buildroot.net/results/a4cd7ecc6d983aa6f15d3be1e21529f17e04b825/
- http://autobuild.buildroot.net/results/2bab8ffa590d4c4eabffe94ed27311c7f6607c98/

CC Yann E. MORIN <[email protected]>

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 33 lines
---
 package/ripgrep/ripgrep.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
package/ripgrep/ripgrep.mk +8 -2
index 5f58630ffe..9dd8d58de1 100644
@@ -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)
Signature · 1 line
2.27.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/ripgrep: fix build directories

In reply to sam.voss at gmail.com
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"sam" == sam voss <[email protected]> writes:

From: Sam Voss <[email protected]>
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.

Quoted 6 lines

Fixes:
- http://autobuild.buildroot.net/results/a4cd7ecc6d983aa6f15d3be1e21529f17e04b825/
- http://autobuild.buildroot.net/results/2bab8ffa590d4c4eabffe94ed27311c7f6607c98/

CC Yann E. MORIN <[email protected]>

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard