Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ overlays = [
# Update vendor macro.
{ type = "file-search-replace", file = "macros", regex = "%_vendor.*", replacement = "%_vendor azurelinux" },

{ type = "file-search-replace", file = "macros", regex = "%__cflags_arch_x86_64_level .*", replacement = "%__cflags_arch_x86_64_level -v2" },

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit (style): Add a comment above this or include a description field in the overlay itself.


# Remove dist.sh file; we'll replace it wholesale with our own version.
{ type = "file-remove", file = "dist.sh" },
# Add our own version of dist.sh customized for Azure Linux.
Expand Down
2 changes: 1 addition & 1 deletion locks/azurelinux-rpm-config.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '6e4185bb29f2ca019b36bec8006e7ad60e58cade'
upstream-commit = '6e4185bb29f2ca019b36bec8006e7ad60e58cade'
input-fingerprint = 'sha256:cb133fba511f946ad698cc0b1eb4487223b9710e6253522195d7f277c77d2649'
input-fingerprint = 'sha256:b93d647bc6e52070e97d9d3ad6824b61acbc7515524159f92f851c3a3c647fd2'
resolution-input-hash = 'sha256:ed1c0158b0942459a3c1a7f3db4f08a88242ce03d0f325b50e1c411f48c8c514'
2 changes: 1 addition & 1 deletion specs/a/azurelinux-rpm-config/azurelinux-rpm-config.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Name: azurelinux-rpm-config
# the older branch. When the branch diverges, bump the Version to the Fedora
# release number.
Version: 1004
Release: 3%{?dist}
Release: 5%{?dist}
# config.guess, config.sub are GPL-3.0-or-later WITH Autoconf-exception-generic
License: GPL-1.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic
URL: https://aka.ms/azurelinux
Expand Down
2 changes: 1 addition & 1 deletion specs/a/azurelinux-rpm-config/macros
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end

# Architecture-specific support. Internal. Do not use directly.

%__cflags_arch_x86_64_level %[0%{?rhel} == 9 ? "-v2" : ""]%[0%{?rhel} > 9 ? "-v3" : ""]
%__cflags_arch_x86_64_level -v2
%__cflags_arch_x86_64 -march=x86-64%{?__cflags_arch_x86_64_level:%{__cflags_arch_x86_64_level}}

%__cflags_arch_x86_64_common -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -mtls-dialect=gnu2 %{_frame_pointers_cflags} %{_frame_pointers_cflags_x86_64}
Expand Down
Loading