diff --git a/srcpkgs/bcachefs-tools/patches/make.patch b/srcpkgs/bcachefs-tools/patches/make.patch index d39baba7e29..080678a159f 100644 --- a/srcpkgs/bcachefs-tools/patches/make.patch +++ b/srcpkgs/bcachefs-tools/patches/make.patch @@ -1,19 +1,18 @@ --- a/Makefile +++ b/Makefile -@@ -39,7 +39,7 @@ - CARGO_PROFILE=release +@@ -57,7 +57,7 @@ # CARGO_PROFILE=debug + CARGO_MANIFEST=--manifest-path rust-src/Cargo.toml -CARGO_BUILD_ARGS=--$(CARGO_PROFILE) +CARGO_BUILD_ARGS=--$(CARGO_PROFILE) --target $(RUST_TARGET) - CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) - VERSION?=$(shell git describe --dirty=+ 2>/dev/null || echo v0.1-nogit) + CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) $(CARGO_MANIFEST) -@@ -126,7 +126,10 @@ - - RUST_SRCS=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs') + CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS) $(CARGO_MANIFEST) +@@ -190,6 +190,9 @@ + RUST_SRCS:=$(shell find rust-src/src rust-src/bch_bindgen/src -type f -iname '*.rs') rust-src/target/release/libbcachefs_rust.a: $(RUST_SRCS) - $(CARGO_BUILD) --manifest-path rust-src/Cargo.toml + $(CARGO_BUILD) + if [ -f rust-src/target/*/release/libbcachefs_rust.a ]; then \ + cp rust-src/target/*/release/libbcachefs_rust.a $@; \ + fi diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template index 35fa36d13a3..ddd11e0a57b 100644 --- a/srcpkgs/bcachefs-tools/template +++ b/srcpkgs/bcachefs-tools/template @@ -1,7 +1,7 @@ # Template file for 'bcachefs-tools' pkgname=bcachefs-tools reverts="24_1" -version=1.3.6 +version=1.4.0 revision=1 build_style=gnu-makefile make_install_args="ROOT_SBINDIR=/usr/bin" @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://bcachefs.org/" distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz" -checksum=9349dc42f1bdedbcacca5b91889a71a25d198947e22619681cb8eb6ca11f5a89 +checksum=3fea7aba076d1400eba29317c8b1de0b8ed83012ab004afaa948fc0750807f58 export VERSION=v${version} export RUST_TARGET