dcavalca / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone

Blame rpm-4.14.3-macroize-find-debuginfo-script-location.patch

James Antill ee2eaf
From 77007d68782b66f2d00d7b200516731246876dca Mon Sep 17 00:00:00 2001
James Antill ee2eaf
From: Panu Matilainen <pmatilai@redhat.com>
James Antill ee2eaf
Date: Thu, 27 May 2021 13:58:58 +0300
James Antill ee2eaf
Subject: [PATCH] Macroize find-debuginfo script location
James Antill ee2eaf
James Antill ee2eaf
Makes it easier to handle varying paths, mainly in preparation for the
James Antill ee2eaf
next step.
James Antill ee2eaf
James Antill ee2eaf
Backported for 4.14.3.
James Antill ee2eaf
---
James Antill ee2eaf
 macros.in | 4 +++-
James Antill ee2eaf
 1 file changed, 3 insertions(+), 1 deletion(-)
James Antill ee2eaf
James Antill ee2eaf
diff --git a/macros.in b/macros.in
James Antill ee2eaf
index a6069ee4d..be28a3b28 100644
James Antill ee2eaf
--- a/macros.in
James Antill ee2eaf
+++ b/macros.in
James Antill ee2eaf
@@ -82,6 +82,8 @@
James Antill ee2eaf
 %__remsh		%{__rsh}
James Antill ee2eaf
 %__strip		@__STRIP@
James Antill ee2eaf
 
James Antill ee2eaf
+%__find_debuginfo	%{_rpmconfigdir}/find-debuginfo.sh
James Antill ee2eaf
+
James Antill ee2eaf
 # XXX avoid failures if tools are not installed when rpm is built.
James Antill ee2eaf
 %__libtoolize		libtoolize
James Antill ee2eaf
 %__aclocal		aclocal
James Antill ee2eaf
@@ -177,7 +179,7 @@
James Antill ee2eaf
 #	the script.  See the script for details.
James Antill ee2eaf
 #
James Antill ee2eaf
 %__debug_install_post   \
James Antill ee2eaf
-    %{_rpmconfigdir}/find-debuginfo.sh \\\
James Antill ee2eaf
+    %{__find_debuginfo} \\\
James Antill ee2eaf
     %{?_smp_mflags} \\\
James Antill ee2eaf
     %{?_missing_build_ids_terminate_build:--strict-build-id} \\\
James Antill ee2eaf
     %{?_no_recompute_build_ids:-n} \\\
James Antill ee2eaf
-- 
James Antill ee2eaf
2.33.1
James Antill ee2eaf