From 68be38be1e8a864234a1e9169561bd44796fcc2f Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 20 Feb 2026 18:21:56 +0000 Subject: [PATCH] Fix libtsan/liblsan replace rules to include .a files The gcc spec now has libtsan.a and liblsan.a lines between the .so and _preinit.o entries. Update find/replace patterns in both the install loop and sysroot %files sections to match. --- config.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config.yaml b/config.yaml index 66abeab..e043510 100644 --- a/config.yaml +++ b/config.yaml @@ -45,16 +45,20 @@ actions: - target: "spec" find: | %{_prefix}/lib64/libtsan.so.2 \ + %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a \ %{_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.a \ %{_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.a \ %{_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.a \ %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o \ %endif count: 1 @@ -89,16 +93,20 @@ actions: - target: "spec" find: | %{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2 + %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o %{sysroot_prefix}%{_prefix}/lib64/liblsan.so.0 + %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.a %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o replace: | %if %{build_libtsan} %{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2 + %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o %endif %if %{build_liblsan} %{sysroot_prefix}%{_prefix}/lib64/liblsan.so.0 + %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.a %{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o %endif count: 1