gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-vcs/git: handle cargo properly

Browse Source 
The build system calls cargo in a script meaning cargo eclass has to be
used to set the proper toolchain values.

Closes: https://bugs.gentoo.org/978391
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1295
Merges: https://codeberg.org/gentoo/gentoo/pulls/1295
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alfred Wingate
2026-07-02 11:13:17 +03:00
committed by Sam James
parent 53a6735980
commit 71bcb06b98
8 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dev-vcs/git/git-2.52.0.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -192,6 +192,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -319,7 +320,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use tk ; then
local tkdir

13
dev-vcs/git/git-2.53.0.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -314,7 +315,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use tk ; then
local tkdir

13
dev-vcs/git/git-2.54.0.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -304,7 +305,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use doc ; then
# Workaround fragments that still use the Makefile and can't

13
dev-vcs/git/git-2.55.0.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -304,7 +305,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use doc ; then
# Workaround fragments that still use the Makefile and can't

13
dev-vcs/git/git-9999-r1.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -304,7 +305,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use doc ; then
# Workaround fragments that still use the Makefile and can't

13
dev-vcs/git/git-9999-r2.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -304,7 +305,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use doc ; then
# Workaround fragments that still use the Makefile and can't

13
dev-vcs/git/git-9999-r3.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -304,7 +305,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use doc ; then
# Workaround fragments that still use the Makefile and can't

13
dev-vcs/git/git-9999.ebuild
View File

@@ -7,9 +7,9 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
RUST_OPTIONAL=1
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
inherit plocale python-single-r1 rust systemd meson
CARGO_OPTIONAL=1
inherit cargo flag-o-matic toolchain-funcs perl-module shell-completion
inherit optfeature plocale python-single-r1 systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -187,6 +187,7 @@ src_unpack() {
git-r3_src_unpack
fi
use rust && cargo_gen_config
}
src_prepare() {
@@ -304,7 +305,11 @@ git_emake() {
}
src_compile() {
meson_src_compile
if use rust; then # bug #978391
cargo_env meson_src_compile
else
meson_src_compile
fi
if use doc ; then
# Workaround fragments that still use the Makefile and can't