diff options
author | Jani Välimaa <wally@mageia.org> | 2023-12-05 21:42:38 +0200 |
---|---|---|
committer | Jani Välimaa <wally@mageia.org> | 2023-12-05 21:42:38 +0200 |
commit | 5b2047b05ead5353c1d3ca3e8112424eb1c7aae4 (patch) | |
tree | 25cb7187d14298de525f45b090ba5b4ca636d61f | |
parent | ce8ea0fd5850c613b918b161159c5ccd18a43d8d (diff) | |
download | rpm-setup-5b2047b05ead5353c1d3ca3e8112424eb1c7aae4.tar rpm-setup-5b2047b05ead5353c1d3ca3e8112424eb1c7aae4.tar.gz rpm-setup-5b2047b05ead5353c1d3ca3e8112424eb1c7aae4.tar.bz2 rpm-setup-5b2047b05ead5353c1d3ca3e8112424eb1c7aae4.tar.xz rpm-setup-5b2047b05ead5353c1d3ca3e8112424eb1c7aae4.zip |
macros: simplify %serverbuild macro
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | macros.in | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -3,6 +3,7 @@ - rpmrc: drop arches we don't really support - rpmrc: drop arch_compat also available in /usr/lib/rpm/rpmrc - macros: use -fstack-protector-strong instead of '-fstack-protector --param=ssp-buffer-size=4' in %_ssp_cflags +- macros: simplify %serverbuild macro - macros: use -Wl,-z,now with -Wl,-z,relro unless _disable_ld_now is defined - mangle script shebangs @@ -251,13 +251,13 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} - # cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments %Werror_cflags -Wformat -Werror=format-security -%_ssp_cflags -fstack-protector-strong %{?_serverbuild_flags: %_serverbuild_flags} +%_ssp_cflags -fstack-protector-strong %__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags}%{?_legacy_common_support: -fcommon} %__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags} # Servers opt flags. # Also set the env variables for backward compatibility (mdv #32050). -%serverbuild %define _serverbuild_flags -fstack-protector-all \ +%serverbuild %define _ssp_cflags -fstack-protector-all \ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%optflags" \ %{nil} |