rpms/libsolv
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Set x86_64 arch as exchangeable to x86_64_v2

Browse Source
This commit is contained in:
eabdullin 2024-11-21 18:05:40 +03:00
parent d353a9beee
commit 1b3c0fdaea
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
SOURCES/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch Normal file
View File

@ -0,0 +1,39 @@
From 51dcde546160d68e8569ee3c9a846f4c40bd8f88 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 21 Nov 2024 18:04:03 +0300
Subject: [PATCH] Set x86_64 arch as exchangeable to x86_64_v2
---
src/poolarch.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/poolarch.c b/src/poolarch.c
index e5fb5bf..70715cc 100644
--- a/src/poolarch.c
+++ b/src/poolarch.c
@@ -24,13 +24,13 @@ static const char *archpolicies[] = {
#if defined(FEDORA) || defined(MAGEIA)
"x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386",
"x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386",
- "x86_64_v2", "x86_64_v2:x86_64:athlon:i686:i586:i486:i386",
- "x86_64", "x86_64:athlon:i686:i586:i486:i386",
+ "x86_64_v2", "x86_64_v2=x86_64:athlon:i686:i586:i486:i386",
+ "x86_64", "x86_64=x86_64_v2:athlon:i686:i586:i486:i386",
#else
"x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386",
"x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386",
- "x86_64_v2", "x86_64_v2:x86_64:i686:i586:i486:i386",
- "x86_64", "x86_64:i686:i586:i486:i386",
+ "x86_64_v2", "x86_64_v2=x86_64:i686:i586:i486:i386",
+ "x86_64", "x86_64=x86_64_v2:i686:i586:i486:i386",
#endif
"i686", "i686:i586:i486:i386",
"i586", "i586:i486:i386",
@@ -170,4 +170,3 @@ pool_arch2color_slow(Pool *pool, Id arch)
pool->id2color[arch] = color;
return color;
}
-
--
2.39.5 (Apple Git-154)

8
SPECS/libsolv.spec
View File

@ -23,7 +23,7 @@
Name: lib%{libname} Name: lib%{libname}
Version: 0.7.24 Version: 0.7.24
Release: 3%{?dist} Release: 3%{?dist}.alma.1
Summary: Package dependency solver Summary: Package dependency solver
License: BSD License: BSD
@ -39,6 +39,9 @@ Patch6: 0006-Allow_break_arch_lock_step_on_erase.patch
Patch7: libsolv-0.7.24-static_analysis_fixes.patch Patch7: libsolv-0.7.24-static_analysis_fixes.patch
Patch8: libsolv-0.7.24-repo_conda-overwrite-the-package-subdir-with-the-inf.patch Patch8: libsolv-0.7.24-repo_conda-overwrite-the-package-subdir-with-the-inf.patch
# AlmaLinux patches
Patch100: 0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: ninja-build BuildRequires: ninja-build
@ -264,6 +267,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%endif %endif
%changelog %changelog
* Thu Nov 21 2024 Eduard Abdullin <eabdullin@almalinux.org> - 0.7.24-3.alma.1
- Set x86_64 arch as exchangeable to x86_64_v2
* Tue Apr 09 2024 Petr Pisar <ppisar@redhat.com> - 0.7.24-3 * Tue Apr 09 2024 Petr Pisar <ppisar@redhat.com> - 0.7.24-3
- Some static analysis fixes for unitialized structs - Some static analysis fixes for unitialized structs
Resolves: RHEL-25498 Resolves: RHEL-25498