Drop hardened_build option

Now that we correctly use Fedora's ldflags (previous commit), there's
no need to do anything special to enable hardened build. All of it is
already included in the default build flags.
This commit is contained in:
Kalev Lember 2022-08-17 10:31:20 +02:00
parent 078b597b1e
commit 73c24a4d45

View File

@ -65,7 +65,6 @@ ExcludeArch: s390x
%else %else
%global system_libvpx 0 %global system_libvpx 0
%endif %endif
%global hardened_build 1
%global system_jpeg 1 %global system_jpeg 1
%global disable_elfhack 1 %global disable_elfhack 1
%global use_bundled_cbindgen 1 %global use_bundled_cbindgen 1
@ -657,9 +656,6 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
# Workaround for mozbz#1531309 # Workaround for mozbz#1531309
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//') MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
%if %{?hardened_build}
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
%endif
%if %{?debug_build} %if %{?debug_build}
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
%endif %endif
@ -1074,6 +1070,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Drop obsolete build conditionals - Drop obsolete build conditionals
- Drop unused patches - Drop unused patches
- Use build_ldflags - Use build_ldflags
- Drop hardened_build option
* Tue Aug 23 2022 Jan Horak <jhorak@redhat.com> - 104.0-4 * Tue Aug 23 2022 Jan Horak <jhorak@redhat.com> - 104.0-4
- Rebuild due to ppc64le fixes - Rebuild due to ppc64le fixes