package/bat: new package
PATCH v3 1/1 package/bat: new package
From: David Pierret <[email protected]>
bat is a cat(1) clone with syntax highlighting and Git integration.
This package need rust version 1.37.0 or later
Using the Aarch64 ARM toolchain that use the prefix "aarch64-none-linux-gnu-", we need to set CC_aarch64_unknown_linux_gnu in the environment to provide the right toolchain prefix.
Otherwise the build fail because rust use aarch64-unknown-linux-gnu as default toolchain prefix.
Since we set CC_aarch64_unknown_linux_gnu, convert RUSTC_TARGET_NAME aarch64-unknown-linux-gnu to aarch64_unknown_linux_gnu since bash doesn't allow to minus characters in environement variables.
See for all supported toolchain prefix:
https://github.com/rust-lang/rust/blob/52d2c7ac948d6abdc18eb9e05a53d03ddcaffd98/src/librustc_target/spec/mod.rs#L492
----
bat supports syntax highlighting for a large number of programming and markup languages. He can communicates with git to show modifications with respect to the index.
For conveignance use, bat can pipe its own output to less if the output is too large for one screen.
v3: remove "env" and use CC_$(subst -,_,$(RUSTC_TARGET_NAME))
instead of CC_$(RUSTC_TARGET_NAME)
v1 -> v2
Add selection of less out of busybox for command line option compatibility
--- DEVELOPERS | 3 +++ package/Config.in | 1 + package/bat/Config.in | 13 +++++++++++++ package/bat/bat.hash | 4 ++++ package/bat/bat.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) create mode 100644 package/bat/Config.in create mode 100644 package/bat/bat.hash create mode 100644 package/bat/bat.mk
DEVELOPERS +3 -0
@@ -680,6 +680,9 @@ F: linux/linux-ext-ev3dev-linux-drivers.mk F: package/brickd/ F: package/ev3dev-linux-drivers/ +N: David Pierret <[email protected]> +F: package/bat/ + N: Davide Viti <[email protected]> F: board/friendlyarm/nanopi-r1/ F: configs/nanopi_r1_defconfig
package/Config.in +1 -0
@@ -2427,6 +2427,7 @@ menu "System tools" endmenu menu "Text editors and viewers" + source "package/bat/Config.in" source "package/ed/Config.in" source "package/joe/Config.in" source "package/less/Config.in"
package/bat/Config.in new file +13 -0
@@ -0,0 +1,13 @@ +config BR2_PACKAGE_BAT + bool "bat" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + # we need a full version of less + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + # less needs ncurses + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_LESS + help + A cat(1) clone with syntax highlighting and Git integration. + + https://github.com/sharkdp/bat
package/bat/bat.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Locally generated +sha256 f4aee370013e2a3bc84c405738ed0ab6e334d3a9f22c18031a7ea008cd5abd2a bat-0.13.0.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE +sha256 dc931b3f4376dc2b12486ded9f51487719099074587d757ea6125bb59deeb221 LICENSE-MIT
package/bat/bat.mk new file +37 -0
@@ -0,0 +1,37 @@ +################################################################################ +# +# bat +# +################################################################################ + +BAT_VERSION = 0.13.0 +BAT_SITE = $(call github,sharkdp,bat,v$(BAT_VERSION)) +BAT_LICENSE = Apache-2.0 or MIT +BAT_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT +BAT_DEPENDENCIES = host-rustc + +BAT_CFLAGS = $(TARGET_CFLAGS) + +BAT_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo +BAT_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) + +BAT_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(BAT_CARGO_MODE) + +BAT_CARGO_OPTS = \ + --bins \ + --$(BAT_CARGO_MODE) \ + --target=$(RUSTC_TARGET_NAME) \ + --manifest-path=$(@D)/Cargo.toml + +define BAT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BAT_CARGO_ENV) \ + CC_$(subst -,_,$(RUSTC_TARGET_NAME))=$(TARGET_CC) \ + cargo build $(BAT_CARGO_OPTS) +endef + +define BAT_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/$(BAT_BIN_DIR)/bat \ + $(TARGET_DIR)/usr/bin/bat +endef + +$(eval $(generic-package))
Signature · 1 line
2.25.4
PATCH v3 1/1 package/bat: new package
package/bat/Config.in line 8
Quoted 2 lines · On Mon, 27 Jul 2020 16:09:22 +0200 Romain Naour <[email protected]> wrote:
package/bat/Config.in new file +2
-0+ # less needs ncurses + select BR2_PACKAGE_NCURSES
less already selects ncurses, so why do we need ncurses here ?
package/bat/bat.mk line 28
Quoted 9 lines
package/bat/bat.mk new file +9
-0+BAT_CARGO_OPTS = \ + --bins \ + --$(BAT_CARGO_MODE) \ + --target=$(RUSTC_TARGET_NAME) \ + --manifest-path=$(@D)/Cargo.toml + +define BAT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BAT_CARGO_ENV) \ + CC_$(subst -,_,$(RUSTC_TARGET_NAME))=$(TARGET_CC) \
I am still not happy with this. There is no reason why this should be passed on a per-package basis, it should be handled by "cargo" and all the cross-compilation configuration it has.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 1/1 package/bat: new package
Hi Thomas,
Le 27/07/2020 ? 17:01, Thomas Petazzoni a ?crit?:
Quoted 7 lines
package/bat/Config.in line 8
Quoted 2 lines · On Mon, 27 Jul 2020 16:09:22 +0200 Romain Naour <[email protected]> wrote:
package/bat/Config.in new file +2
-0+ # less needs ncurses + select BR2_PACKAGE_NCURSESless already selects ncurses, so why do we need ncurses here ?
Indeed.
Quoted 14 lines
package/bat/bat.mk line 28
Quoted 10 lines
package/bat/bat.mk new file +9
-0+BAT_CARGO_OPTS = \ + --bins \ + --$(BAT_CARGO_MODE) \ + --target=$(RUSTC_TARGET_NAME) \ + --manifest-path=$(@D)/Cargo.toml + +define BAT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BAT_CARGO_ENV) \ + CC_$(subst -,_,$(RUSTC_TARGET_NAME))=$(TARGET_CC) \I am still not happy with this. There is no reason why this should be passed on a per-package basis, it should be handled by "cargo" and all the cross-compilation configuration it has.
Well, I guess the pkg-cargo.mk infra will handle this.
I discovered CC_aarch64_unknown_linux_gnu by looking at a Dockerfile example:
I'm not sure why it's not handled by config.toml...
Best regards,
Romain
Quoted 3 lines
Thomas
PATCH v3 1/1 package/bat: new package
Hi Thomas,
Le 27/07/2020 ? 18:02, Romain Naour a ?crit?:
Quoted 28 lines
Hi Thomas,
Le 27/07/2020 ? 17:01, Thomas Petazzoni a ?crit?:
Quoted 7 lines
package/bat/Config.in line 8
Quoted 2 lines · On Mon, 27 Jul 2020 16:09:22 +0200 Romain Naour <[email protected]> wrote:
package/bat/Config.in new file +2
-0+ # less needs ncurses + select BR2_PACKAGE_NCURSESless already selects ncurses, so why do we need ncurses here ?
Indeed.
Quoted 14 lines
package/bat/bat.mk line 28
Quoted 10 lines
package/bat/bat.mk new file +9
-0+BAT_CARGO_OPTS = \ + --bins \ + --$(BAT_CARGO_MODE) \ + --target=$(RUSTC_TARGET_NAME) \ + --manifest-path=$(@D)/Cargo.toml + +define BAT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BAT_CARGO_ENV) \ + CC_$(subst -,_,$(RUSTC_TARGET_NAME))=$(TARGET_CC) \I am still not happy with this. There is no reason why this should be passed on a per-package basis, it should be handled by "cargo" and all the cross-compilation configuration it has.
Quoted 7 lines
Well, I guess the pkg-cargo.mk infra will handle this.
I discovered
CC_aarch64_unknown_linux_gnuby looking at a Dockerfile example:I'm not sure why it's not handled by config.toml...
Sorry but cargo/rust is in trouble when the toolchain prefix is not listed in [1], the toolchain prefix is "lost" when building some VENDOR dependencies and the default prefix is used:
--- stdout
TARGET = Some("aarch64-unknown-linux-gnu")OPT_LEVEL = Some("3")
HOST = Some("x86_64-unknown-linux-gnu")
CC_aarch64-unknown-linux-gnu = NoneCC_aarch64_unknown_linux_gnu = NoneTARGET_CC = None
CC = NoneCROSS_COMPILE = None
CFLAGS_aarch64-unknown-linux-gnu = NoneCFLAGS_aarch64_unknown_linux_gnu = NoneTARGET_CFLAGS = None
CFLAGS = NoneCRATE_CC_NO_DEFAULTS = None
DEBUG = Some("false")CARGO_CFG_TARGET_FEATURE = None
I guess the pkg-cargo infra should at least set:
CC_$(subst -,_,$(RUSTC_TARGET_NAME))=$(TARGET_CC)
But for now it's per package basis.
Only bat package seems to use VENDOR dependencies. There is no VENDOR directory in the ripgrep build directory.
Best regards,
Romain
Quoted 8 lines
Best regards,
RomainQuoted 3 lines
Thomas