aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2024-12-28 12:59:03 +0200
committerJani Välimaa <wally@mageia.org>2024-12-28 12:59:03 +0200
commit8c71814b616db68f42731dc49819c2e2e4df3a87 (patch)
tree7ee817a655962051d9c03798c2a5bd55e51d5841
parent537cbf68e3f2237ec5e4e6393f46e458295d2322 (diff)
downloadrpm-setup-8c71814b616db68f42731dc49819c2e2e4df3a87.tar
rpm-setup-8c71814b616db68f42731dc49819c2e2e4df3a87.tar.gz
rpm-setup-8c71814b616db68f42731dc49819c2e2e4df3a87.tar.bz2
rpm-setup-8c71814b616db68f42731dc49819c2e2e4df3a87.tar.xz
rpm-setup-8c71814b616db68f42731dc49819c2e2e4df3a87.zip
macros: automatically use %set_build_flags macro for build, check, and install phases
-rw-r--r--NEWS2
-rw-r--r--macros.in11
2 files changed, 13 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e66e121..6b3c2ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- macros: automatically use %set_build_flags macro for build, check, and install phases
+
Version 2.81 - 11 November 2024, by Jani Välimaa
- macros: add redhat-hardened-clang-ld.cfg (from Fedora) to pass -pie when linking with clang
- macros: add %dist_vendor (Mageia) and %dist_name (Mageia Linux) macros
diff --git a/macros.in b/macros.in
index 35168fa..1020af0 100644
--- a/macros.in
+++ b/macros.in
@@ -293,6 +293,16 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
%{warn:%%setup_compile_flags is deprecated, use %%set_build_flags instead} \
%set_build_flags
+# Automatically use set_build_flags macro for build, check, and
+# install phases.
+# Use "%undefine _auto_set_build_flags" to disable"
+%_auto_set_build_flags 1
+%__spec_build_pre %{___build_pre} \
+ %{?_auto_set_build_flags:%{set_build_flags}}
+
+%__spec_check_pre %{___build_pre} \
+ %{?_auto_set_build_flags:%{set_build_flags}}
+
%debugcflags %{?_enable_debug_packages:-g}
%_fortify_level 3
@@ -518,6 +528,7 @@ if [ %{_with install} -eq 1 ]; then\
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
mkdir -p `dirname "$RPM_BUILD_ROOT"`\
mkdir "$RPM_BUILD_ROOT"\
+ %{?_auto_set_build_flags:%{set_build_flags}}\
fi
#---------------------------------------------------------------------