[packages/rpm-pld-macros] make %{cargo_objdir} relative to $(pwd); 2.059

atler atler at pld-linux.org
Mon Apr 13 00:28:02 CEST 2026


commit 9a68b1af4419744ea6b267c0806611eb276bb651
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Apr 13 00:17:32 2026 +0200

    make %{cargo_objdir} relative to $(pwd); 2.059
    
    cargo macros might be invoked from a subdir

 macros.rust         | 2 +-
 rpm-pld-macros.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 737222d..50746f4 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.058
+%define		rpm_macros_rev	2.059
 %define		find_lang_rev	1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
diff --git a/macros.rust b/macros.rust
index 5f25737..e644851 100644
--- a/macros.rust
+++ b/macros.rust
@@ -31,7 +31,7 @@ thumbv7neon-unknown-linux-gnueabihf\\\
 
 %cargo_target	%rust_target
 %cargo_targetdir	target
-%cargo_objdir		%{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{rust_target}/%{!?debug:release}%{?debug:debug}
+%cargo_objdir		%{cargo_targetdir}/%{rust_target}/%{!?debug:release}%{?debug:debug}
 
 %__rustc	/usr/bin/rustc
 %__cargo	/usr/bin/cargo
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/9a68b1af4419744ea6b267c0806611eb276bb651



More information about the pld-cvs-commit mailing list