Skip to content

Commit

Permalink
weor[i
Browse files Browse the repository at this point in the history
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
  • Loading branch information
SergiiDmytruk committed Jan 16, 2025
1 parent 71e8fb6 commit 54eb825
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions grub2.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,18 @@ Source13: 99-grub-mkconfig.install
%endif
%global legacy_host_cflags \\\
%{expand:%%(echo %{host_cflags} | \\\
sed -e 's/-m64//g' -e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g' \\\
sed \\\
-e 's/-m64//g' \\\
-e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g' \\\
)}
%global efi_host_cflags %{expand:%%(echo %{host_cflags})}

%global target_cflags %{expand:%%(echo %{build_cflags} | %{cflags_sed})}
%global legacy_target_cflags \\\
%{expand:%%(echo %{target_cflags} | \\\
%{cflags_sed} -e 's/-m64//g' -e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g' \\\
%{cflags_sed} \\\
-e 's/-m64//g' \\\
-e 's/-mcpu=power[[:alnum:]]\\+/-mcpu=power6/g' \\\
)}
%global efi_target_cflags %{expand:%%(echo %{target_cflags})}

Expand Down Expand Up @@ -199,7 +203,10 @@ Source13: 99-grub-mkconfig.install

%global alt_efi_host_cflags %{expand:%%(echo %{efi_host_cflags})}
%global alt_efi_target_cflags \\\
%{expand:%%(echo %{target_cflags} | %{cflags_sed} -e 's/-m64//g' )}
%{expand:%%(echo %{target_cflags} | \\\
%{cflags_sed} \\\
-e 's/-m64//g' \\\
)}
%endif

%ifarch aarch64
Expand Down Expand Up @@ -565,7 +572,7 @@ ${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv \\\
cd .. \
%{nil}

# TODO: switch to %%upper macro with rpm 4.19+
# TODO: switch to %upper macro with rpm 4.19+
%define upper_() %{lua:print(string.upper(rpm.expand("%{1}")))}

# This is supposed to be case-insensitive anyway. But all-uppercase (even for
Expand Down

0 comments on commit 54eb825

Please sign in to comment.