Fix sysroot packages for i686 architecture
This commit is contained in:
parent
7df36ab755
commit
ad96a447e7
51
gcc.spec
51
gcc.spec
@ -166,7 +166,7 @@
|
||||
Summary: Various compilers (C, C++, Objective-C, ...)
|
||||
Name: gcc
|
||||
Version: %{gcc_version}
|
||||
Release: %{gcc_release}.3%{?dist}.alma.1
|
||||
Release: %{gcc_release}.3%{?dist}.alma.2
|
||||
# License notes for some of the less obvious ones:
|
||||
# gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para
|
||||
# isl: MIT, BSD-2-Clause
|
||||
@ -2931,25 +2931,29 @@ hwasan_sysroot_libs=
|
||||
hwasan_sysroot_libs="%{_prefix}/lib64/libhwasan.so.0 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan_preinit.o"
|
||||
%endif
|
||||
for f in /lib64/libgcc_s.so.1 \
|
||||
%{_prefix}/lib64/libgomp.so.1 \
|
||||
%{_prefix}/lib64/libstdc++.so.6 \
|
||||
for f in /%{_lib}/libgcc_s.so.1 \
|
||||
%{_prefix}/%{_lib}/libgomp.so.1 \
|
||||
%{_prefix}/%{_lib}/libstdc++.so.6 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++fs.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libsupc++.a \
|
||||
%{_prefix}/lib64/libatomic.so.1 \
|
||||
%{_prefix}/%{_lib}/libatomic.so.1 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a \
|
||||
%{_prefix}/lib64/libitm.so.1 \
|
||||
%{_prefix}/%{_lib}/libitm.so.1 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libitm.a \
|
||||
%{_prefix}/lib64/libasan.so.8 \
|
||||
%{_prefix}/%{_lib}/libasan.so.8 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o \
|
||||
$hwasan_sysroot_libs \
|
||||
%{_prefix}/lib64/libtsan.so.2 \
|
||||
%if %{build_libtsan}
|
||||
%{_prefix}/%{_lib}/libtsan.so.2 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o \
|
||||
%{_prefix}/lib64/liblsan.so.0 \
|
||||
%endif
|
||||
%if %{build_liblsan}
|
||||
%{_prefix}/%{_lib}/liblsan.so.0 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o \
|
||||
%{_prefix}/lib64/libubsan.so.1; do
|
||||
%endif
|
||||
%{_prefix}/%{_lib}/libubsan.so.1; do
|
||||
mkdir -p %{buildroot}/%{sysroot_prefix}/$(dirname $f)
|
||||
cp %{buildroot}$f %{buildroot}/%{sysroot_prefix}/$f
|
||||
done
|
||||
@ -4473,39 +4477,43 @@ end
|
||||
# Package the symlinks into usr/ here.
|
||||
%{sysroot_prefix}/lib
|
||||
%{sysroot_prefix}/lib64
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libgcc_s.so.1
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libgcc_s.so.1
|
||||
|
||||
%files -n %{sysroot_package_arch}-libgomp
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libgomp.so.1
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libgomp.so.1
|
||||
|
||||
%files -n %{sysroot_package_arch}-libstdc++
|
||||
%{sysroot_prefix}%{_prefix}/include/c++
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libstdc++.so.6
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libstdc++.so.6
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++fs.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libsupc++.a
|
||||
|
||||
%files -n %{sysroot_package_arch}-libatomic
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libatomic.so.1
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libatomic.so.1
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libatomic.a
|
||||
|
||||
%files -n %{sysroot_package_arch}-libitm
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libitm.so.1
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libitm.so.1
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libitm.a
|
||||
|
||||
%files -n %{sysroot_package_arch}-libsanitizer
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libasan.so.8
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libasan.so.8
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libasan_preinit.o
|
||||
%if %{build_libhwasan}
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libhwasan.so.0
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libhwasan.so.0
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libhwasan_preinit.o
|
||||
%endif
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2
|
||||
%if %{build_libtsan}
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libtsan.so.2
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o
|
||||
%{sysroot_prefix}%{_prefix}/lib64/liblsan.so.0
|
||||
%endif
|
||||
%if %{build_liblsan}
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/liblsan.so.0
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libubsan.so.1
|
||||
%endif
|
||||
%{sysroot_prefix}%{_prefix}/%{_lib}/libubsan.so.1
|
||||
|
||||
%files -n %{sysroot_package_arch}-test-support
|
||||
# Package the symlinks into usr/ here.
|
||||
@ -4513,6 +4521,9 @@ end
|
||||
%{sysroot_prefix}/test-support/auto-host.h
|
||||
|
||||
%changelog
|
||||
* Mon Feb 02 2026 Eduard Abdullin <eabdullin@almalinux.org> - 14.3.1-4.3.alma.2
|
||||
- Fix sysroot packages for i686 architecture
|
||||
|
||||
* Wed Jan 28 2026 Eduard Abdullin <eabdullin@almalinux.org> - 14.3.1-4.3.alma.1
|
||||
- Change to almalinux bugtracker
|
||||
- Set --with-arch_64=x86-64-v2 on v2 arch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user