From d15904ceddc771f0c9d7f85f1098dd233af99755 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Wed, 11 Feb 2026 12:39:28 +0300
Subject: [PATCH] Fix sysroot packages for i686 architecture

---
 config.yaml | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/config.yaml b/config.yaml
index 13648e1..9acc94b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -17,6 +17,96 @@ actions:
           %endif
         count: 1
 
+# Fix for i686 sysroot pkgs
+      - target: "spec"
+        find: "/lib64/libgcc_s.so.1 \\"
+        replace: "/%{_lib}/libgcc_s.so.1 \\"
+        count: 1
+      - target: "spec"
+        find: "%{_prefix}/lib64/libgomp.so.1 \\"
+        replace: "%{_prefix}/%{_lib}/libgomp.so.1 \\"
+        count: 1
+      - target: "spec"
+        find: "%{_prefix}/lib64/libstdc++.so.6 \\"
+        replace: "%{_prefix}/%{_lib}/libstdc++.so.6 \\"
+        count: 1
+      - target: "spec"
+        find: "%{_prefix}/lib64/libatomic.so.1 \\"
+        replace: "%{_prefix}/%{_lib}/libatomic.so.1 \\"
+        count: 1
+      - target: "spec"
+        find: "%{_prefix}/lib64/libitm.so.1 \\"
+        replace: "%{_prefix}/%{_lib}/libitm.so.1 \\"
+        count: 1
+      - target: "spec"
+        find: "%{_prefix}/lib64/libasan.so.8 \\"
+        replace: "%{_prefix}/%{_lib}/libasan.so.8 \\"
+        count: 1
+      - target: "spec"
+        find: |
+              %{_prefix}/lib64/libtsan.so.2 \
+              %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o \
+              %{_prefix}/lib64/liblsan.so.0 \
+              %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o \
+        replace: |
+            %if %{build_libtsan}
+              %{_prefix}/lib64/libtsan.so.2 \
+              %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o \
+            %endif
+            %if %{build_liblsan}
+              %{_prefix}/lib64/liblsan.so.0 \
+              %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o \
+            %endif
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libgcc_s.so.1"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libgcc_s.so.1"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libgomp.so.1"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libgomp.so.1"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libgomp.so.1"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libgomp.so.1"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libstdc++.so.6"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libstdc++.so.6"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libatomic.so.1"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libatomic.so.1"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libitm.so.1"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libitm.so.1"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libasan.so.8"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libasan.so.8"
+        count: 1
+      - target: "spec"
+        find: "%{sysroot_prefix}%{_prefix}/lib64/libhwasan.so.0"
+        replace: "%{sysroot_prefix}%{_prefix}/%{_lib}/libhwasan.so.0"
+        count: 1
+      - target: "spec"
+        find: |
+            %{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2
+            %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o
+            %{_prefix}/lib64/liblsan.so.0
+            %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o
+        replace: |
+            %if %{build_libtsan}
+            %{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2
+            %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o
+            %endif
+            %if %{build_liblsan}
+            %{_prefix}/lib64/liblsan.so.0
+            %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o
+            %endif
+        count: 1
+
   - modify_release:
     - suffix: ".alma.1"
       enabled: true
@@ -27,3 +117,4 @@ actions:
         line:
           - "Change to almalinux bugtracker"
           - "Set --with-arch_64=x86-64-v2 on v2 arch"
+          - "Fix sysroot packages for i686 architecture"