!7 [bugfix] Change libstdc++_nonshared48.a to libstdc++_nonshared80.a

From: @zhaoshujian 
Reviewed-by: @li-yancheng 
Signed-off-by: @li-yancheng
This commit is contained in:
openeuler-ci-bot 2024-09-04 03:51:01 +00:00 committed by Gitee
commit 26b81d3862
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 839 additions and 5588 deletions

File diff suppressed because it is too large Load Diff

View File

@ -90,7 +90,7 @@
Summary: Various compilers (C, C++, Objective-C, ...)
Name: %{?_scl_prefix}gcc%{gcc_ver}
Version: 14.2.1
Release: 4
Release: 5
# libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
# GCC Runtime Exception.
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@ -174,7 +174,7 @@ Patch1002: GCC14-1002-change-gcc-version.patch
Patch1003: GCC14-1003-i386-Add-non-optimize-prefetchi-intrins.patch
# On ARM EABI systems, we do want -gnueabi to be part of the
# target triple.
%global nonsharedver 48
%global nonsharedver 80
%ifnarch %{arm}
%global _gnu %{nil}
%else
@ -285,9 +285,6 @@ with the GNU Compiler Collection.
Summary: Static Fortran libraries
Requires: %{?_scl_prefix}gcc%{gcc_ver} = %{version}-%{release}
%if %{build_libquadmath}
%if 0%{!?scl:1}
Requires: libquadmath
%endif
Requires: %{?_scl_prefix}libquadmath%{gcc_ver} = %{version}-%{release}
%endif
@ -911,11 +908,7 @@ INPUT ( %{?scl:%{_root_prefix}}%{!?scl:%{_prefix}}/%{_lib}/libstdc++.so.6 -lstdc
rm -f libquadmath.so
echo '/* GNU ld script */
%{oformat}
%if 0%{!?scl:1}
INPUT ( %{_prefix}/%{_lib}/libquadmath.so.0 )' > libquadmath.so
%else
INPUT ( %{_root_prefix}/%{_lib}/libquadmath.so.0 )' > libquadmath.so
%endif
%endif
%if %{build_libasan}
@ -1007,11 +1000,7 @@ INPUT ( %{_prefix}/lib64/libgccjit.so.0 )' > 64/libgccjit.so
rm -f 64/libquadmath.so
echo '/* GNU ld script */
%{oformat2}
%if 0%{!?scl:1}
INPUT ( %{_prefix}/lib64/libquadmath.so.0 )' > 64/libquadmath.so
%else
INPUT ( %{_root_prefix}/lib64/libquadmath.so.0 )' > 64/libquadmath.so
%endif
%endif
%if %{build_libitm}
rm -f libitm.so
@ -1093,11 +1082,7 @@ INPUT ( %{_prefix}/lib/libgccjit.so.0 )' > 32/libgccjit.so
rm -f 32/libquadmath.so
echo '/* GNU ld script */
%{oformat2}
%if 0%{!?scl:1}
INPUT ( %{_prefix}/lib/libquadmath.so.0 )' > 32/libquadmath.so
%else
INPUT ( %{_root_prefix}/lib/libquadmath.so.0 )' > 32/libquadmath.so
%endif
%endif
%if %{build_libitm}
rm -f libitm.so
@ -1228,10 +1213,8 @@ chrpath -d %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/pl
chmod 755 %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/libcp1plugin.so*
chrpath -d %{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/plugin/libcp1plugin.so*
%if %{build_libquadmath}
%if 0%{!?scl:1}
chmod 755 %{buildroot}%{_prefix}/%{_lib}/libquadmath.so.0.*
%endif
%endif
%if %{build_libitm}
chmod 755 %{buildroot}%{_prefix}/%{_lib}/libitm.so.1.*
%endif
@ -1359,9 +1342,6 @@ rm -f %{buildroot}%{_prefix}/%{_lib}/libvtv* || :
rm -f %{buildroot}/lib/cpp
rm -f %{buildroot}%{_prefix}/bin/{gccbug,gnatgcc*}
rm -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gfortran
%if 0%{!?scl:1}
rm -f %{buildroot}%{_prefix}/bin/{*c++*,cc,cpp}
%endif
rm -f %{buildroot}%{_prefix}/bin/%{_target_platform}-gfortran || :
%ifarch %{multilib_64_archs}
@ -2221,6 +2201,9 @@ end
%doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog
* Wed Aug 28 2024 zhaoshujian <zhaoshujian@huawei.com> - 14.2.1-5
- Change stdc++_nonshared_48 to stdc++_nonshared_80.
* Tue Aug 27 2024 zhaoshujian <zhaoshujian@huawei.com> - 14.2.1-4
- [bugfix] Change libsupc++.a, libstdc++exp.a package path