[packages/git-core] pass CARGO_BUILD_TARGET to make test, build rust with rpmrustflags
arekm
arekm at pld-linux.org
Tue Sep 29 13:24:53 CEST 2026
commit e08a02a2bf80e78b9b4fcb6ee496559a25aab6da
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 29 13:23:57 2026 +0200
pass CARGO_BUILD_TARGET to make test, build rust with rpmrustflags
make test relinked everything against a second, unflagged cargo build; xz BR is for the source, not tk
git-core.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index f982c36..9823cd1 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -65,8 +65,8 @@ BuildRequires: tar >= 1:1.22
%if %{with tk}
# wish
BuildRequires: tk
-BuildRequires: xz
%endif
+BuildRequires: xz
BuildRequires: zlib-devel
%if %{with doc}
BuildRequires: asciidoc >= 7.1.2-3
@@ -471,6 +471,7 @@ cp -a contrib contrib-doc
echo "BLK_SHA1=1" >> config.mak
+export RUSTFLAGS="%{rpmrustflags}"
%{__make} \
GITWEB_CONFIG="%{webappdir}/gitweb.conf" \
GITWEB_PROJECTROOT="/var/lib/git" \
@@ -508,7 +509,7 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t91??"
export GIT_SKIP_TESTS
%{__make} test \
NO_PERL_CPAN_FALLBACKS=1 \
- RUST_TARGET_DIR="%{cargo_objdir}"
+ CARGO_BUILD_TARGET="%rust_target"
%endif
%install
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/e08a02a2bf80e78b9b4fcb6ee496559a25aab6da
More information about the pld-cvs-commit
mailing list