From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 13 Aug 2025 09:42:03 +0000 (+0200)
Subject: - merged 2.049 from PLD
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=e17152f2dcf9853caf3f06bcecfcedff294dda30;p=packages%2Frpm-tld-macros.git

- merged 2.049 from PLD
---

diff --git a/macros.python b/macros.python
index 36e26e7..48b238f 100644
--- a/macros.python
+++ b/macros.python
@@ -46,6 +46,10 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
 	%{?__cc:CC="%{__cc}"; export CC;} \
 	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	PKG_CONFIG_ALLOW_CROSS=1; export PKG_CONFIG_ALLOW_CROSS; \
+	RUSTC="${RUSTC:-%__rustc}"; export RUSTC; \
+	%{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"; export RUSTC_WRAPPER;} \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}"; export RUSTFLAGS; \
 	%{__python} setup.py \
 	build --build-base=build-2 \
 }
@@ -65,6 +69,10 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
 	%{?__cc:CC="%{__cc}"; export CC;} \
 	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	PKG_CONFIG_ALLOW_CROSS=1; export PKG_CONFIG_ALLOW_CROSS; \
+	RUSTC="${RUSTC:-%__rustc}"; export RUSTC; \
+	%{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"; export RUSTC_WRAPPER;} \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}"; export RUSTFLAGS; \
 	%{__python} setup.py \
 	build --build-base=build-2 \
 	install --skip-build \
@@ -78,6 +86,10 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
 	%{?__cc:CC="%{__cc}"; export CC;} \
 	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	PKG_CONFIG_ALLOW_CROSS=1; export PKG_CONFIG_ALLOW_CROSS; \
+	RUSTC="${RUSTC:-%__rustc}"; export RUSTC; \
+	%{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"; export RUSTC_WRAPPER;} \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}"; export RUSTFLAGS; \
 	%{__python3} setup.py build --build-base=build-3 \
 }
 
@@ -96,6 +108,10 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
 	%{?__cc:CC="%{__cc}"; export CC;} \
 	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	PKG_CONFIG_ALLOW_CROSS=1; export PKG_CONFIG_ALLOW_CROSS; \
+	RUSTC="${RUSTC:-%__rustc}"; export RUSTC; \
+	%{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"; export RUSTC_WRAPPER;} \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}"; export RUSTFLAGS; \
 	%{__python3} setup.py \
 	build --build-base=build-3 \
 	install --skip-build \
@@ -110,6 +126,10 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
 	%{?__cc:CC="%{__cc}"; export CC;} \
 	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	PKG_CONFIG_ALLOW_CROSS=1; export PKG_CONFIG_ALLOW_CROSS; \
+	RUSTC="${RUSTC:-%__rustc}"; export RUSTC; \
+	%{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"; export RUSTC_WRAPPER;} \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}"; export RUSTFLAGS; \
         %{__python3} \
         -m build \
         --wheel \
@@ -130,6 +150,10 @@
 	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
 	%{?__cc:CC="%{__cc}"; export CC;} \
 	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	PKG_CONFIG_ALLOW_CROSS=1; export PKG_CONFIG_ALLOW_CROSS; \
+	RUSTC="${RUSTC:-%__rustc}"; export RUSTC; \
+	%{?rustc_wrapper:RUSTC_WRAPPER="${RUSTC_WRAPPER:-%rustc_wrapper}"; export RUSTC_WRAPPER;} \
+	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}"; export RUSTFLAGS; \
         %{__python3} \
         -m installer \
         --destdir=$RPM_BUILD_ROOT \
diff --git a/macros.tld b/macros.tld
index 84ed96b..1231e52 100644
--- a/macros.tld
+++ b/macros.tld
@@ -280,7 +280,14 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 	fi; \
 )}%_topdir
 
-%_tmppath		%(echo "${TMPDIR:-/var/tmp}")
+%_tmppath %{lua:
+local tmpdir = os.getenv("TMPDIR")
+if not tmpdir or tmpdir == "" then
+  tmpdir = "/var/tmp"
+end
+print(tmpdir)
+}
+
 %tmpdir			%{_tmppath}
 
 # Left for compatibility with rpm < 4.20
@@ -1421,7 +1428,7 @@ fi;
 	filelist='%{-s*}'
 	i=$base
 	while read checksum file; do
-		printf "patch%d %s\\n" $i "$patchlevel" | sed -e s,^,%%,
+		printf "patch -P%d %s\\n" $i "$patchlevel" | sed -e s,^,%%,
 		i=$((i+1))
 	done < $filelist
 }
@@ -1429,7 +1436,7 @@ fi;
 	start=$(expr $base + %1);
 	end=$(expr $base + %{?2}%{!?2:%{1}});
 	echo ": patchset_patch %1%{?2: to %2}";
-	seq -f "patch%g $patchlevel" $start $end | sed -e s,^,%%,;
+	seq -f "patch -P%g $patchlevel" $start $end | sed -e s,^,%%,;
 }
 ) \
 %{nil}
diff --git a/rpm-tld-macros.spec b/rpm-tld-macros.spec
index c696118..bba8309 100644
--- a/rpm-tld-macros.spec
+++ b/rpm-tld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.047
+%define		rpm_macros_rev	2.049
 %define		find_lang_rev	1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15