!6 [bugfix] Change libsupc++.a, libstdc++exp.a package path
From: @zhaoshujian Reviewed-by: @li-yancheng Signed-off-by: @li-yancheng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
67f5a1cd4e
59
gcc-14.spec
59
gcc-14.spec
@ -90,7 +90,7 @@
|
||||
Summary: Various compilers (C, C++, Objective-C, ...)
|
||||
Name: %{?_scl_prefix}gcc%{gcc_ver}
|
||||
Version: 14.2.1
|
||||
Release: 3
|
||||
Release: 4
|
||||
# libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
|
||||
# GCC Runtime Exception.
|
||||
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
|
||||
@ -729,17 +729,6 @@ make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} \
|
||||
FULLPATH=%{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}
|
||||
FULLEPATH=%{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
|
||||
|
||||
%if 0%{?scl:1}
|
||||
ln -sf ../../../../bin/ar $FULLEPATH/ar
|
||||
ln -sf ../../../../bin/as $FULLEPATH/as
|
||||
ln -sf ../../../../bin/ld $FULLEPATH/ld
|
||||
ln -sf ../../../../bin/ld.bfd $FULLEPATH/ld.bfd
|
||||
ln -sf ../../../../bin/ld.gold $FULLEPATH/ld.gold
|
||||
ln -sf ../../../../bin/nm $FULLEPATH/nm
|
||||
ln -sf ../../../../bin/objcopy $FULLEPATH/objcopy
|
||||
ln -sf ../../../../bin/ranlib $FULLEPATH/ranlib
|
||||
ln -sf ../../../../bin/strip $FULLEPATH/strip
|
||||
%endif
|
||||
# fix some things
|
||||
ln -sf gcc %{buildroot}%{_prefix}/bin/cc
|
||||
mkdir -p %{buildroot}/lib
|
||||
@ -967,6 +956,7 @@ INPUT ( %{?scl:%{_prefix}}/%{_lib}/liblsan.so.0 )' > liblsan.so
|
||||
%endif
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++fs.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++exp.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libsupc++.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libgfortran.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.*a .
|
||||
@ -1057,6 +1047,10 @@ ln -sf lib32/libstdc++fs.a libstdc++fs.a
|
||||
ln -sf ../lib64/libstdc++fs.a 64/libstdc++fs.a
|
||||
ln -sf lib32/libstdc++_nonshared.a libstdc++_nonshared.a
|
||||
ln -sf ../lib64/libstdc++_nonshared.a 64/libstdc++_nonshared.a
|
||||
ln -sf lib32/libstdc++exp.a libstdc++exp.a
|
||||
ln -sf ../lib64/libstdc++exp.a 64/libstdc++exp.a
|
||||
ln -sf lib32/libsupc++.a libsupc++.a
|
||||
ln -sf ../lib64/libsupc++.a 64/libsupc++.a
|
||||
%if %{build_libquadmath}
|
||||
ln -sf lib32/libquadmath.a libquadmath.a
|
||||
ln -sf ../lib64/libquadmath.a 64/libquadmath.a
|
||||
@ -1141,6 +1135,10 @@ ln -sf ../lib32/libstdc++fs.a 32/libstdc++fs.a
|
||||
ln -sf lib64/libstdc++fs.a libstdc++fs.a
|
||||
ln -sf ../lib32/libstdc++_nonshared.a 32/libstdc++_nonshared.a
|
||||
ln -sf lib64/libstdc++_nonshared.a libstdc++_nonshared.a
|
||||
ln -sf ../lib32/libstdc++exp.a 32/libstdc++exp.a
|
||||
ln -sf lib64/libstdc++exp.a libstdc++exp.a
|
||||
ln -sf ../lib32/libsupc++.a 32/libsupc++.a
|
||||
ln -sf lib64/libsupc++.a libsupc++.a
|
||||
%if %{build_libquadmath}
|
||||
ln -sf ../lib32/libquadmath.a 32/libquadmath.a
|
||||
ln -sf lib64/libquadmath.a libquadmath.a
|
||||
@ -1169,7 +1167,9 @@ mv -f lib64/libubsan.a libubsan.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libgfortran.a 32/libgfortran.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++.a 32/libstdc++.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++fs.a 32/libstdc++fs.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}%{?_gnu}/%{gcc_major}/libstdc++_nonshared.a 32/libstdc++_nonshared.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++_nonshared.a 32/libstdc++_nonshared.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libstdc++exp.a 32/libstdc++exp.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libsupc++.a 32/libsupc++.a
|
||||
%if %{build_libquadmath}
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_major}/libquadmath.a 32/libquadmath.a
|
||||
%endif
|
||||
@ -1202,7 +1202,7 @@ for d in . $FULLLSUBDIR; do
|
||||
-o -name libtsan.a -o -name libubsan.a \
|
||||
-o -name liblsan.a \
|
||||
-o -name libstdc++_nonshared.a \
|
||||
-o -name libsupc++.a \
|
||||
-o -name libsupc++.a -o -name libstdc++exp.a\
|
||||
-o -name libstdc++.a -o -name libcaf_single.a \
|
||||
-o -name libstdc++fs.a \) -a -type f`; do
|
||||
cp -a $f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/$d/
|
||||
@ -1341,7 +1341,7 @@ cd ..
|
||||
|
||||
# Remove binaries we will not be including, so that they don't end up in
|
||||
# gcc-debuginfo
|
||||
rm -f %{buildroot}%{_prefix}/%{_lib}/{libffi*,libiberty.a,libstdc++*,libgfortran.so,libgcc_s.so} || :
|
||||
rm -f %{buildroot}%{_prefix}/%{_lib}/{libffi*,libiberty.a,libstdc++.so*,libgfortran.so,libgcc_s.so} || :
|
||||
%if 0%{?scl:1}
|
||||
rm -f %{buildroot}%{_prefix}/%{_lib}/{libitm.so,libatomic.so,libasan.so,libtsan.so,libubsan.so,liblsan.so}
|
||||
%if %{build_libquadmath}
|
||||
@ -1647,6 +1647,12 @@ end
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/prfchiintrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/raointintrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/amxcomplexintrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avx512bitalgvlintrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/avxvnniint16intrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sha512intrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sm3intrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/sm4intrin.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/usermsrintrin.h
|
||||
%endif
|
||||
%ifarch ia64
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/ia64intrin.h
|
||||
@ -1691,6 +1697,8 @@ end
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_fp16.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_bf16.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sve.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sme.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_neon_sve_bridge.h
|
||||
%endif
|
||||
%ifarch sparc sparcv9 sparc64
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/visintrin.h
|
||||
@ -1712,17 +1720,6 @@ end
|
||||
%endif
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cc1
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/collect2
|
||||
%if 0%{?scl:1}
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/ar
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/as
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/ld
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/ld.bfd
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/ld.gold
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/nm
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/objcopy
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/ranlib
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/strip
|
||||
%endif
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/crt*.o
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcc.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgcov.a
|
||||
@ -1872,6 +1869,7 @@ end
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++fs.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++_nonshared.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libstdc++exp.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/64/libsupc++.a
|
||||
%endif
|
||||
%ifarch %{multilib_64_archs}
|
||||
@ -1880,6 +1878,7 @@ end
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++fs.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++_nonshared.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libstdc++exp.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/32/libsupc++.a
|
||||
%endif
|
||||
%ifarch sparcv9 ppc %{multilib_64_archs}
|
||||
@ -1890,6 +1889,8 @@ end
|
||||
%{_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++_nonshared.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libsupc++.a
|
||||
%endif
|
||||
%doc rpm.doc/changelogs/gcc/cp/ChangeLog*
|
||||
|
||||
@ -1905,17 +1906,20 @@ end
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++fs.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++_nonshared.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib32/libstdc++exp.a
|
||||
%endif
|
||||
%ifarch sparc64 ppc64
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++fs.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++_nonshared.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/lib64/libstdc++exp.a
|
||||
%endif
|
||||
%ifnarch sparcv9 sparc64 ppc ppc64
|
||||
%{_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++_nonshared.a
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++exp.a
|
||||
%endif
|
||||
%ifnarch sparcv9 ppc %{multilib_64_archs}
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libstdc++.so
|
||||
@ -2217,6 +2221,9 @@ end
|
||||
%doc rpm.doc/changelogs/libcc1/ChangeLog*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 27 2024 zhaoshujian <zhaoshujian@huawei.com> - 14.2.1-4
|
||||
- [bugfix] Change libsupc++.a, libstdc++exp.a package path
|
||||
|
||||
* Sat Aug 24 2024 zhaoshujian <zhaoshujian@huawei.com> - 14.2.1-3
|
||||
- [bugfix] Change libgomp, libfortran, libgcc_s, libitm, libatomic package path
|
||||
- Add gcc-toolset-14 Readme
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user