mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-20 12:33:40 -04:00
Merge updates from master
This commit is contained in:
25
app-containers/pods/files/disable-clippy-test-2.1.0.patch
Normal file
25
app-containers/pods/files/disable-clippy-test-2.1.0.patch
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/src/meson.build b/src/meson.build
|
||||||
|
index 776f6c1e..83c7db3c 100644
|
||||||
|
--- a/src/meson.build
|
||||||
|
+++ b/src/meson.build
|
||||||
|
@@ -65,20 +65,3 @@ cargo = find_program('cargo', required: true)
|
||||||
|
cargo_target_dir = meson.project_build_root() / 'target'
|
||||||
|
cargo_home = meson.project_build_root() / 'cargo-home'
|
||||||
|
manifest_path = meson.project_source_root() / 'Cargo.toml'
|
||||||
|
-test (
|
||||||
|
- 'clippy',
|
||||||
|
- cargo,
|
||||||
|
- args: [
|
||||||
|
- 'clippy',
|
||||||
|
- '--manifest-path=@0@'.format(manifest_path),
|
||||||
|
- '--target-dir=@0@'.format(cargo_target_dir),
|
||||||
|
- '--',
|
||||||
|
- '-D',
|
||||||
|
- 'warnings',
|
||||||
|
- ],
|
||||||
|
- env: [
|
||||||
|
- 'CARGO_HOME=@0@'.format(cargo_home),
|
||||||
|
- 'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin',
|
||||||
|
- ],
|
||||||
|
- timeout: 300, # Give cargo more time
|
||||||
|
-)
|
||||||
@@ -361,6 +361,10 @@ BDEPEND="
|
|||||||
# Rust
|
# Rust
|
||||||
QA_FLAGS_IGNORED="usr/bin/${PN}"
|
QA_FLAGS_IGNORED="usr/bin/${PN}"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/disable-clippy-test-2.1.0.patch
|
||||||
|
)
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
meson_src_configure
|
meson_src_configure
|
||||||
ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
|
ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ LICENSE+=" AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016"
|
|||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="~amd64"
|
KEYWORDS="~amd64"
|
||||||
|
|
||||||
|
BDEPEND="
|
||||||
|
dev-libs/protobuf
|
||||||
|
"
|
||||||
|
|
||||||
src_unpack() {
|
src_unpack() {
|
||||||
default
|
default
|
||||||
cargo_gen_config
|
cargo_gen_config
|
||||||
Reference in New Issue
Block a user