[packages/rpm-pld-macros] - parametrize dir and shell for both configure macros, 2.043

[baggins]

commit 336ef07b21acb4aee42f46ba6224ade3c83f6a7c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Feb 7 13:51:10 2025 +0100

    - parametrize dir and shell for both configure macros, 2.043

 macros.pld          | 59 ++++++++++++++++++++++++++++-------------------------
 rpm-pld-macros.spec |  2 +-
 2 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 7db5e76..a2d2e45 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.042
+%define		rpm_macros_rev	2.043
 %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.pld b/macros.pld
index 7fed372..764c408 100644
--- a/macros.pld
+++ b/macros.pld
@@ -438,9 +438,12 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %{nil}
 
 #-----------------------------------------------------------------
+%configuredir .
+%configureshell %{nil}
+
 %configure2_13 { \
  %{set_build_flags}; \
- %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \
+ %{?configureshell:%{configureshell}} %{configuredir}/configure \
 	--host=%{_target_platform} \
 	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
@@ -459,6 +462,33 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 	%{dependencytracking} \
 }
 
+#----------------------------------------------------------------
+#%configure_cache 0
+%configure_cache_file	%{buildroot}.configure.cache
+
+%configure { \
+  %{set_build_flags}; \
+ %{?configureshell:%{configureshell}} %{configuredir}/configure \
+	--host=%{_target_platform} \
+	--build=%{_target_platform} \
+	--prefix=%{_prefix} \
+	--exec-prefix=%{_exec_prefix} \
+	--bindir=%{_bindir} \
+	--sbindir=%{_sbindir} \
+	--sysconfdir=%{_sysconfdir} \
+	--datadir=%{_datadir} \
+	--includedir=%{_includedir} \
+	--libdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
+	--localstatedir=%{_localstatedir} \
+	--sharedstatedir=%{_sharedstatedir} \
+	--mandir=%{_mandir} \
+	--infodir=%{_infodir} \
+	--x-libraries=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
+	%{dependencytracking} \
+	%{?configure_cache:--cache-file=%{configure_cache_file}} \
+}
+
 # Note: pass only standard cmake macros here.
 # The only exception is SYSCONF_INSTALL_DIR, used commonly in KDE packages,
 # where the default (${CMAKE_INSTALL_PREFIX}/etc) is not FHS-compliant and
@@ -534,33 +564,6 @@ LINKFLAGS="%{rpmldflags}" \
 %{__waf} \
 }
 
-#----------------------------------------------------------------
-#%configure_cache 0
-%configure_cache_file	%{buildroot}.configure.cache
-
-%configure { \
-  %{set_build_flags}; \
-  ./configure \
-	--host=%{_target_platform} \
-	--build=%{_target_platform} \
-	--prefix=%{_prefix} \
-	--exec-prefix=%{_exec_prefix} \
-	--bindir=%{_bindir} \
-	--sbindir=%{_sbindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--includedir=%{_includedir} \
-	--libdir=%{_libdir} \
-	--libexecdir=%{_libexecdir} \
-	--localstatedir=%{_localstatedir} \
-	--sharedstatedir=%{_sharedstatedir} \
-	--mandir=%{_mandir} \
-	--infodir=%{_infodir} \
-	--x-libraries=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
-	%{dependencytracking} \
-	%{?configure_cache:--cache-file=%{configure_cache_file}} \
-}
-
 # Simple macros to simplify adding bconded options to configure scripts.
 #   Each macro requires bcond name and accepts optional option name, if option
 # isn't specified bcond name is used as option name. Options returning
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/336ef07b21acb4aee42f46ba6224ade3c83f6a7c