Small tweaks.

This commit is contained in:
Jakub Jelinek 2024-04-25 12:16:50 +02:00
parent 7294abbf86
commit d818c7e53a

View File

@ -1206,7 +1206,11 @@ CONFIGURE_OPTS="\
%endif %endif
%ifarch x86_64 %ifarch x86_64
%if 0%{?rhel} > 8 %if 0%{?rhel} > 8
%if 0%{?rhel} > 9
--with-arch_64=x86-64-v3 \
%else
--with-arch_64=x86-64-v2 \ --with-arch_64=x86-64-v2 \
%endif
%endif %endif
--with-arch_32=x86-64 \ --with-arch_32=x86-64 \
%endif %endif
@ -1564,12 +1568,10 @@ for f in `find %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_plat
done done
# Nuke bits/*.h.gch dirs # Nuke bits/*.h.gch dirs
# 1) there is no bits/*.h header installed, so when gch file can't be # 1) sometimes it is hard to match the exact options used for building
# used, compilation fails
# 2) sometimes it is hard to match the exact options used for building
# libstdc++-v3 or they aren't desirable # libstdc++-v3 or they aren't desirable
# 3) there are multilib issues, conflicts etc. with this # 2) there are multilib issues, conflicts etc. with this
# 4) it is huge # 3) it is huge
# People can always precompile on their own whatever they want, but # People can always precompile on their own whatever they want, but
# shipping this for everybody is unnecessary. # shipping this for everybody is unnecessary.
rm -rf %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_platform}/bits/*.h.gch rm -rf %{buildroot}%{_prefix}/include/c++/%{gcc_major}/%{gcc_target_platform}/bits/*.h.gch
@ -1581,6 +1583,7 @@ cp -r -p ../libstdc++-v3/doc/html ../rpm.doc/libstdc++-v3/html
cp -r -p $libstdcxx_doc_builddir/html ../rpm.doc/libstdc++-v3/html/api cp -r -p $libstdcxx_doc_builddir/html ../rpm.doc/libstdc++-v3/html/api
mkdir -p %{buildroot}%{_mandir}/man3 mkdir -p %{buildroot}%{_mandir}/man3
cp -r -p $libstdcxx_doc_builddir/man/man3/* %{buildroot}%{_mandir}/man3/ cp -r -p $libstdcxx_doc_builddir/man/man3/* %{buildroot}%{_mandir}/man3/
rm -f %{buildroot}%{_mandir}/man3/TEMP.*
find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm
%endif %endif
@ -3621,6 +3624,11 @@ end
%endif %endif
%changelog %changelog
* Thu Apr 25 2024 Jakub Jelinek <jakub@redhat.com>
- switch to --with-arch_64=x86-64-v3 for latest RHEL
- remove obsolete reason for not shipping *.gch* files
- remove TEMP.* man page from libstdc++-docs
* Thu Apr 11 2024 Jakub Jelinek <jakub@redhat.com> 14.0.1-0.15 * Thu Apr 11 2024 Jakub Jelinek <jakub@redhat.com> 14.0.1-0.15
- update from trunk - update from trunk
- PRs analyzer/114472, c++/114303, c++/114409, debug/112878, - PRs analyzer/114472, c++/114303, c++/114409, debug/112878,