rpm/gcc13
SHA256
1
0
Fork 0
forked from pool/gcc13
Code Pull Requests Activity

- Redo floatn fixinclude pick-up to simply keep what is there.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=7
This commit is contained in:
Richard Biener 2022-12-14 07:54:01 +00:00 committed by Git OBS Bridge
parent a0b0d96e1f
commit c067c70bfe
4 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gcc.spec.in
View File

@ -114,15 +114,6 @@
%define build_jit 0
%endif
%if 0%{suse_version} >= 1599 || 0%{?sle_version:%sle_version} >= 150300
# FIXME: more once glibc 2.37 is released
%define glibc_version %(rpm -q glibc --qf '%%{VERSION}')
%define floatn_fixed_glibc %(case " %{glibc_version} " in (*9000*) echo 1;; (*) echo 0;; esac)
%else
# The headers are not present in earlier glibc
%define floatn_fixed_glibc 1
%endif
# Shared library SONAME versions
%ifarch hppa
%define libgcc_s 4
@ -1900,6 +1891,19 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/ucontext.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/rseq.h
# Whether floatn.h is fixed depends on the glibc version and architecture.
# For now keep it if it's there but in the end we want to fix glibc itself
# everywhere.
if test -f %{buildroot}/%{libsubdir}/include-fixed/bits/floatn.h; then
cat > ../floatn-fixes.list <<EOF
%dir %{libsubdir}/include-fixed/bits
%{libsubdir}/include-fixed/bits/floatn-common.h
%{libsubdir}/include-fixed/bits/floatn.h
EOF
else
echo > ../floatn-fixes.list
fi
%if !%{enable_plugins}
# no plugins
rm -rf %{buildroot}/%{libsubdir}/plugin
@ -1995,16 +1999,13 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnat_ugn%{binsuffix}.info.gz
%endif
%files
%files -f floatn-fixes.list
%defattr(-,root,root)
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
%dir %{libsubdir}/include
%dir %{libsubdir}/include-fixed
%if !%{floatn_fixed_glibc}
%dir %{libsubdir}/include-fixed/bits
%endif
%if %{biarch}
%if %{build_primary_64bit}
%dir %{libsubdir}/32
@ -2027,11 +2028,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang
%{libsubdir}/liblto_plugin.so*
%{libsubdir}/include/limits.h
%{libsubdir}/include/syslimits.h
%if !%{floatn_fixed_glibc}
%{libsubdir}/include-fixed/README
%{libsubdir}/include-fixed/bits/floatn-common.h
%{libsubdir}/include-fixed/bits/floatn.h
%endif
%{libsubdir}/include-fixed/README
%{libsubdir}/include/omp.h
%{libsubdir}/include/float.h

9
gcc13-testresults.spec
View File

@ -134,15 +134,6 @@
%define build_jit 0
%endif
%if 0%{suse_version} >= 1599 || 0%{?sle_version:%sle_version} >= 150300
# FIXME: more once glibc 2.37 is released
%define glibc_version %(rpm -q glibc --qf '%%{VERSION}')
%define floatn_fixed_glibc %(case " %{glibc_version} " in (*9000*) echo 1;; (*) echo 0;; esac)
%else
# The headers are not present in earlier glibc
%define floatn_fixed_glibc 1
%endif
# Shared library SONAME versions
%ifarch hppa
%define libgcc_s 4

5
gcc13.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Dec 14 07:52:36 UTC 2022 - Richard Biener <rguenther@suse.com>
- Redo floatn fixinclude pick-up to simply keep what is there.
-------------------------------------------------------------------
Tue Dec 13 10:34:35 UTC 2022 - Richard Biener <rguenther@suse.com>

32
gcc13.spec
View File

@ -113,15 +113,6 @@
%define build_jit 0
%endif
%if 0%{suse_version} >= 1599 || 0%{?sle_version:%sle_version} >= 150300
# FIXME: more once glibc 2.37 is released
%define glibc_version %(rpm -q glibc --qf '%%{VERSION}')
%define floatn_fixed_glibc %(case " %{glibc_version} " in (*9000*) echo 1;; (*) echo 0;; esac)
%else
# The headers are not present in earlier glibc
%define floatn_fixed_glibc 1
%endif
# Shared library SONAME versions
%ifarch hppa
%define libgcc_s 4
@ -2707,6 +2698,19 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/ucontext.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/rseq.h
# Whether floatn.h is fixed depends on the glibc version and architecture.
# For now keep it if it's there but in the end we want to fix glibc itself
# everywhere.
if test -f %{buildroot}/%{libsubdir}/include-fixed/bits/floatn.h; then
cat > ../floatn-fixes.list <<EOF
%dir %{libsubdir}/include-fixed/bits
%{libsubdir}/include-fixed/bits/floatn-common.h
%{libsubdir}/include-fixed/bits/floatn.h
EOF
else
echo > ../floatn-fixes.list
fi
%if !%{enable_plugins}
# no plugins
rm -rf %{buildroot}/%{libsubdir}/plugin
@ -2800,16 +2804,13 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc13-locale.lang
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnat_ugn%{binsuffix}.info.gz
%endif
%files
%files -f floatn-fixes.list
%defattr(-,root,root)
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
%dir %{libsubdir}/include
%dir %{libsubdir}/include-fixed
%if !%{floatn_fixed_glibc}
%dir %{libsubdir}/include-fixed/bits
%endif
%if %{biarch}
%if %{build_primary_64bit}
%dir %{libsubdir}/32
@ -2832,11 +2833,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc13-locale.lang
%{libsubdir}/liblto_plugin.so*
%{libsubdir}/include/limits.h
%{libsubdir}/include/syslimits.h
%if !%{floatn_fixed_glibc}
%{libsubdir}/include-fixed/README
%{libsubdir}/include-fixed/bits/floatn-common.h
%{libsubdir}/include-fixed/bits/floatn.h
%endif
%{libsubdir}/include-fixed/README
%{libsubdir}/include/omp.h
%{libsubdir}/include/float.h