diff options
| author | root <root@alpha.trunkmasters.com> | 2026-09-11 01:41:34 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-09-11 01:41:34 -0500 |
| commit | fc39c62a8944e95c0ecccfc9781763822b23e66c (patch) | |
| tree | 11feafa0dbddccf6fcd9dabb290b0ce5faafec36 /dev-vcs/git | |
| parent | 98068fb4a1502cade02134b1834439134ca4eed1 (diff) | |
| download | baldeagleos-repo-fc39c62a8944e95c0ecccfc9781763822b23e66c.tar.gz baldeagleos-repo-fc39c62a8944e95c0ecccfc9781763822b23e66c.tar.xz baldeagleos-repo-fc39c62a8944e95c0ecccfc9781763822b23e66c.zip | |
Adding metadata
Diffstat (limited to 'dev-vcs/git')
| -rw-r--r-- | dev-vcs/git/files/git-2.55.0-cargo-meson-cross.patch | 29 | ||||
| -rw-r--r-- | dev-vcs/git/git-2.55.0.ebuild | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-vcs/git/files/git-2.55.0-cargo-meson-cross.patch b/dev-vcs/git/files/git-2.55.0-cargo-meson-cross.patch new file mode 100644 index 000000000000..3363f16b3655 --- /dev/null +++ b/dev-vcs/git/files/git-2.55.0-cargo-meson-cross.patch @@ -0,0 +1,29 @@ +From cee6efe196baed28cd6f6000aa6ac415d1210dfe Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Tue, 8 Sep 2026 16:24:13 +0100 +Subject: [PATCH] rust: respect CARGO_BUILD_TARGET when locating build output + +When cross-compiling, Cargo always writes to a target-tuple subdirectory +determined by CARGO_BUILD_TARGET, even when it matches the native tuple. +The build looked in $BUILD_DIR/$BUILD_TYPE directly, so it failed to +locate the freshly built library. + +Respect CARGO_BUILD_TARGET in the output path so the correct artifact +is located. + +Signed-off-by: James Le Cuirot <chewi@gentoo.org> +--- a/src/cargo-meson.sh ++++ b/src/cargo-meson.sh +@@ -38,7 +38,7 @@ then + exit $RET + fi + +-if ! cmp "$BUILD_DIR/$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a" >/dev/null 2>&1 ++if ! cmp "$BUILD_DIR/${CARGO_BUILD_TARGET-}/$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a" >/dev/null 2>&1 + then +- cp "$BUILD_DIR/$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a" ++ cp "$BUILD_DIR/${CARGO_BUILD_TARGET-}/$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a" + fi +-- +2.55.0 + diff --git a/dev-vcs/git/git-2.55.0.ebuild b/dev-vcs/git/git-2.55.0.ebuild index 36e578e4abce..25950e8be5e9 100644 --- a/dev-vcs/git/git-2.55.0.ebuild +++ b/dev-vcs/git/git-2.55.0.ebuild @@ -153,6 +153,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.54.0-0001-rust-don-t-pass-quiet-to-cargo.patch "${FILESDIR}"/${PN}-2.54.0-0002-rust-respect-CARGO-environment-variable.patch + "${FILESDIR}"/${PN}-2.55.0-cargo-meson-cross.patch ) pkg_setup() { |