Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gcc11 for openSUSE:Factory checked in at 2021-02-11 12:45:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc11 (Old) and /work/SRC/openSUSE:Factory/.gcc11.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc11" Thu Feb 11 12:45:03 2021 rev:2 rq:870326 version:11.0.0+git183291 Changes: -------- --- /work/SRC/openSUSE:Factory/gcc11/cross-aarch64-gcc11.changes 2021-02-04 16:55:30.479872659 +0100 +++ /work/SRC/openSUSE:Factory/.gcc11.new.28504/cross-aarch64-gcc11.changes 2021-02-11 12:45:23.265314195 +0100 @@ -2 +2 @@ -Mon Jan 18 10:42:28 UTC 2021 - Martin Li??ka <[email protected]> +Fri Feb 5 18:04:49 UTC 2021 - Martin Li??ka <[email protected]> @@ -4 +4,33 @@ -- New packages inherits from gcc10 package. +- Bump to 7a18bc4ae62081021f4fd90d591a588cac931f77. + +------------------------------------------------------------------- +Fri Feb 5 08:40:22 UTC 2021 - Martin Li??ka <[email protected]> + +- New package, inherits from gcc10 + * gcc-add-defaultsspec.diff, add the ability to provide a specs + file that is read by default + * tls-no-direct.diff, avoid direct %fs references on x86 to not + slow down Xen + * gcc43-no-unwind-tables.diff, do not produce unwind tables for + CRT files + * gcc41-ppc32-retaddr.patch, fix expansion of __builtin_return_addr + for ppc, just a testcase + * gcc44-textdomain.patch, make translation files version specific + and adjust textdomain to find them + * gcc44-rename-info-files.patch, fix cross-references in info files + when renaming them to be version specific + * gcc48-libstdc++-api-reference.patch, fix link in the installed + libstdc++ html documentation + * gcc48-remove-mpfr-2.4.0-requirement.patch, make GCC work with + earlier mpfr versions on old products + * gcc5-no-return-gcc43-workaround.patch, make build work with + host gcc 4.3 + * gcc7-remove-Wexpansion-to-defined-from-Wextra.patch, removes + new warning from -Wextra + * gcc7-avoid-fixinc-error.diff + * gcc9-reproducible-builds-buildid-for-checksum.patch + * gcc9-reproducible-builds.patch + * gcc10-amdgcn-llvm-as.patch + * gcc10-foffload-default.patch +- libgccjit subpackage is added. +- HWASAN is built for aarch64 target. cross-amdgcn-gcc11.changes: same change cross-arm-gcc11.changes: same change cross-arm-none-gcc11-bootstrap.changes: same change cross-arm-none-gcc11.changes: same change cross-avr-gcc11-bootstrap.changes: same change cross-avr-gcc11.changes: same change cross-epiphany-gcc11-bootstrap.changes: same change cross-epiphany-gcc11.changes: same change cross-hppa-gcc11.changes: same change cross-i386-gcc11.changes: same change cross-m68k-gcc11.changes: same change cross-mips-gcc11.changes: same change cross-nvptx-gcc11.changes: same change cross-ppc64-gcc11.changes: same change cross-ppc64le-gcc11.changes: same change cross-riscv64-elf-gcc11-bootstrap.changes: same change cross-riscv64-elf-gcc11.changes: same change cross-riscv64-gcc11.changes: same change cross-rx-gcc11-bootstrap.changes: same change cross-rx-gcc11.changes: same change cross-s390x-gcc11.changes: same change cross-sparc-gcc11.changes: same change cross-sparc64-gcc11.changes: same change cross-x86_64-gcc11.changes: same change gcc11-testresults.changes: same change --- /work/SRC/openSUSE:Factory/gcc11/gcc11.changes 2021-02-04 16:55:35.915881116 +0100 +++ /work/SRC/openSUSE:Factory/.gcc11.new.28504/gcc11.changes 2021-02-11 12:45:34.601330700 +0100 @@ -2 +2 @@ -Mon Jan 18 10:42:28 UTC 2021 - Martin Li??ka <[email protected]> +Mon Feb 8 17:41:34 UTC 2021 - Martin Li??ka <[email protected]> @@ -4 +4,38 @@ -- New packages inherits from gcc10 package. +- Bump to efcd941e86b507d77e90a1b13f621e036eacdb45. + +------------------------------------------------------------------- +Fri Feb 5 18:04:49 UTC 2021 - Martin Li??ka <[email protected]> + +- Bump to 7a18bc4ae62081021f4fd90d591a588cac931f77. + +------------------------------------------------------------------- +Fri Feb 5 08:40:22 UTC 2021 - Martin Li??ka <[email protected]> + +- New package, inherits from gcc10 + * gcc-add-defaultsspec.diff, add the ability to provide a specs + file that is read by default + * tls-no-direct.diff, avoid direct %fs references on x86 to not + slow down Xen + * gcc43-no-unwind-tables.diff, do not produce unwind tables for + CRT files + * gcc41-ppc32-retaddr.patch, fix expansion of __builtin_return_addr + for ppc, just a testcase + * gcc44-textdomain.patch, make translation files version specific + and adjust textdomain to find them + * gcc44-rename-info-files.patch, fix cross-references in info files + when renaming them to be version specific + * gcc48-libstdc++-api-reference.patch, fix link in the installed + libstdc++ html documentation + * gcc48-remove-mpfr-2.4.0-requirement.patch, make GCC work with + earlier mpfr versions on old products + * gcc5-no-return-gcc43-workaround.patch, make build work with + host gcc 4.3 + * gcc7-remove-Wexpansion-to-defined-from-Wextra.patch, removes + new warning from -Wextra + * gcc7-avoid-fixinc-error.diff + * gcc9-reproducible-builds-buildid-for-checksum.patch + * gcc9-reproducible-builds.patch + * gcc10-amdgcn-llvm-as.patch + * gcc10-foffload-default.patch +- libgccjit subpackage is added. +- HWASAN is built for aarch64 target. Old: ---- gcc-11.0.0+git182924.tar.xz New: ---- gcc-11.0.0+git183291.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc11.spec ++++++ --- /var/tmp/diff_new_pack.NPlwa5/_old 2021-02-11 12:45:38.449336302 +0100 +++ /var/tmp/diff_new_pack.NPlwa5/_new 2021-02-11 12:45:38.453336308 +0100 @@ -114,7 +114,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 11.0.0+git182924 +Version: 11.0.0+git183291 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') cross-amdgcn-gcc11.spec: same change cross-arm-gcc11.spec: same change cross-arm-none-gcc11-bootstrap.spec: same change cross-arm-none-gcc11.spec: same change cross-avr-gcc11-bootstrap.spec: same change cross-avr-gcc11.spec: same change cross-epiphany-gcc11-bootstrap.spec: same change cross-epiphany-gcc11.spec: same change cross-hppa-gcc11.spec: same change cross-i386-gcc11.spec: same change cross-m68k-gcc11.spec: same change cross-mips-gcc11.spec: same change cross-nvptx-gcc11.spec: same change cross-ppc64-gcc11.spec: same change cross-ppc64le-gcc11.spec: same change cross-riscv64-elf-gcc11-bootstrap.spec: same change cross-riscv64-elf-gcc11.spec: same change cross-riscv64-gcc11.spec: same change cross-rx-gcc11-bootstrap.spec: same change cross-rx-gcc11.spec: same change cross-s390x-gcc11.spec: same change cross-sparc-gcc11.spec: same change cross-sparc64-gcc11.spec: same change cross-x86_64-gcc11.spec: same change ++++++ gcc11-testresults.spec ++++++ --- /var/tmp/diff_new_pack.NPlwa5/_old 2021-02-11 12:45:39.081337222 +0100 +++ /var/tmp/diff_new_pack.NPlwa5/_new 2021-02-11 12:45:39.085337228 +0100 @@ -36,6 +36,16 @@ # nospeccleaner +%if !0%{?usrmerged} +%define _slibdir /%{_lib} +%define slibdir /lib +%define slibdir64 /lib64 +%else +%define _slibdir %{_libdir} +%define slibdir %{_prefix}/lib +%define slibdir64 %{_libdir} +%endif + # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 @@ -292,7 +302,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 11.0.0+git182924 +Version: 11.0.0+git183291 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') ++++++ gcc11.spec ++++++ --- /var/tmp/diff_new_pack.NPlwa5/_old 2021-02-11 12:45:39.105337257 +0100 +++ /var/tmp/diff_new_pack.NPlwa5/_new 2021-02-11 12:45:39.109337263 +0100 @@ -18,6 +18,16 @@ # nospeccleaner +%if !0%{?usrmerged} +%define _slibdir /%{_lib} +%define slibdir /lib +%define slibdir64 /lib64 +%else +%define _slibdir %{_libdir} +%define slibdir %{_prefix}/lib +%define slibdir64 %{_libdir} +%endif + # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 @@ -274,7 +284,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 11.0.0+git182924 +Version: 11.0.0+git183291 Release: 0 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -477,7 +487,7 @@ %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix} Summary: Include Files and Libraries mandatory for Development -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Requires: glibc-devel Requires: libstdc++%{libstdcxx_sover} >= %{version}-%{release} @@ -494,7 +504,7 @@ library. It is needed for compiling C++ code. %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-32bit Summary: Include Files and Libraries mandatory for Development -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Requires: glibc-devel-32bit Requires: libstdc++%{libstdcxx_sover}-32bit >= %{version}-%{release} @@ -511,7 +521,7 @@ library. It is needed for compiling C++ code. %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}-64bit Summary: Include Files and Libraries mandatory for Development -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Requires: glibc-devel-64bit Requires: libstdc++%{libstdcxx_sover}-64bit >= %{version}-%{release} @@ -585,7 +595,7 @@ %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix} Summary: C compiler runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgcc_s%{libgcc_s} = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -600,7 +610,7 @@ %postun -n libgcc_s%{libgcc_s}%{libgcc_s_suffix} -p /sbin/ldconfig %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit Summary: C compiler runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgcc_s%{libgcc_s}-32bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -615,7 +625,7 @@ %postun -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit -p /sbin/ldconfig %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-64bit Summary: C compiler runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgcc_s%{libgcc_s}-64bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -631,7 +641,7 @@ %package -n libgomp%{libgomp_sover}%{libgomp_suffix} Summary: The GNU compiler collection OpenMP runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgomp%{libgomp_sover} = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -650,7 +660,7 @@ %postun -n libgomp%{libgomp_sover}%{libgomp_suffix} -p /sbin/ldconfig %package -n libgomp%{libgomp_sover}%{libgomp_suffix}-32bit Summary: The GNU compiler collection OpenMP runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgomp%{libgomp_sover}-32bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -669,7 +679,7 @@ %postun -n libgomp%{libgomp_sover}%{libgomp_suffix}-32bit -p /sbin/ldconfig %package -n libgomp%{libgomp_sover}%{libgomp_suffix}-64bit Summary: The GNU compiler collection OpenMP runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgomp%{libgomp_sover}-64bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -689,7 +699,7 @@ %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix} Summary: The standard C++ shared library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Suggests: libstdc++%{libstdcxx_sover}-locale Provides: libstdc++%{libstdcxx_sover} = %{version}-%{release} @@ -706,7 +716,7 @@ %postun -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix} -p /sbin/ldconfig %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-32bit Summary: The standard C++ shared library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Suggests: libstdc++%{libstdcxx_sover}-locale Provides: libstdc++%{libstdcxx_sover}-32bit = %{version}-%{release} @@ -723,7 +733,7 @@ %postun -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-32bit -p /sbin/ldconfig %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-64bit Summary: The standard C++ shared library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Suggests: libstdc++%{libstdcxx_sover}-locale Provides: libstdc++%{libstdcxx_sover}-64bit = %{version}-%{release} @@ -741,7 +751,7 @@ %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale Summary: Standard C++ Library Locales -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Provides: libstdc++%{libstdcxx_sover}-locale = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -805,7 +815,7 @@ %package -n libobjc%{libobjc_sover}%{libobjc_suffix} Summary: Library for the GNU Objective C Compiler -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Libraries/Other Provides: libobjc%{libobjc_sover} = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -820,7 +830,7 @@ %postun -n libobjc%{libobjc_sover}%{libobjc_suffix} -p /sbin/ldconfig %package -n libobjc%{libobjc_sover}%{libobjc_suffix}-32bit Summary: Library for the GNU Objective C Compiler -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Libraries/Other Provides: libobjc%{libobjc_sover}-32bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -835,7 +845,7 @@ %postun -n libobjc%{libobjc_sover}%{libobjc_suffix}-32bit -p /sbin/ldconfig %package -n libobjc%{libobjc_sover}%{libobjc_suffix}-64bit Summary: Library for the GNU Objective C Compiler -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Libraries/Other Provides: libobjc%{libobjc_sover}-64bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -933,7 +943,7 @@ %package -n libada11 Summary: GNU Ada Runtime Libraries -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Provides: libgnarl-11 = %{version}-%{release} Conflicts: %selfconflict libgnarl-11 @@ -953,7 +963,7 @@ %postun -n libada11 -p /sbin/ldconfig %package -n libada11-32bit Summary: GNU Ada Runtime Libraries -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Provides: libgnarl-11-32bit = %{version}-%{release} Conflicts: %selfconflict libgnarl-11-32bit @@ -973,7 +983,7 @@ %postun -n libada11-32bit -p /sbin/ldconfig %package -n libada11-64bit Summary: GNU Ada Runtime Libraries -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Provides: libgnarl-11-64bit = %{version}-%{release} Conflicts: %selfconflict libgnarl-11-64bit @@ -1034,7 +1044,7 @@ %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix} Summary: The GNU Fortran Compiler Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/Fortran %ifarch %quadmath_arch Requires: libquadmath%{libquadmath_sover} >= %{version}-%{release} @@ -1053,7 +1063,7 @@ %postun -n libgfortran%{libgfortran_sover}%{libgfortran_suffix} -p /sbin/ldconfig %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-32bit Summary: The GNU Fortran Compiler Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/Fortran %ifarch %quadmath_arch Requires: libquadmath%{libquadmath_sover}-32bit >= %{version}-%{release} @@ -1072,7 +1082,7 @@ %postun -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-32bit -p /sbin/ldconfig %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}-64bit Summary: The GNU Fortran Compiler Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/Fortran %ifarch %quadmath_arch Requires: libquadmath%{libquadmath_sover}-64bit >= %{version}-%{release} @@ -1340,7 +1350,7 @@ %package -n libatomic%{libatomic_sover}%{libatomic_suffix} Summary: The GNU Compiler Atomic Operations Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Provides: libatomic%{libatomic_sover} = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -1355,7 +1365,7 @@ %postun -n libatomic%{libatomic_sover}%{libatomic_suffix} -p /sbin/ldconfig %package -n libatomic%{libatomic_sover}%{libatomic_suffix}-32bit Summary: The GNU Compiler Atomic Operations Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Provides: libatomic%{libatomic_sover}-32bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -1370,7 +1380,7 @@ %postun -n libatomic%{libatomic_sover}%{libatomic_suffix}-32bit -p /sbin/ldconfig %package -n libatomic%{libatomic_sover}%{libatomic_suffix}-64bit Summary: The GNU Compiler Atomic Operations Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Provides: libatomic%{libatomic_sover}-64bit = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -2446,6 +2456,9 @@ mv %{buildroot}/%{_lib}/libgcc_s.so %{buildroot}/%{versmainlibdir}/ fi chmod a+x %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s} +%if 0%{?usrmerged} +mv %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s} %{buildroot}/%{_slibdir}/libgcc_s.so.%{libgcc_s} +%endif %if %{biarch} %if %{build_primary_64bit} if test -L %{buildroot}/lib/libgcc_s.so; then @@ -2456,6 +2469,9 @@ fi ln -sf %{versmainlibdirbi32}/libgcc_s.so %{buildroot}/%{versmainlibdirbi32}/libgcc_s_32.so chmod a+x %{buildroot}/lib/libgcc_s.so.%{libgcc_s} +%if 0%{?usrmerged} +mv %{buildroot}/lib/libgcc_s.so.%{libgcc_s} %{buildroot}/%{slibdir}/libgcc_s.so.%{libgcc_s} +%endif %else # 32-bit biarch systems if test -L %{buildroot}/lib64/libgcc_s.so; then @@ -2466,6 +2482,9 @@ fi ln -sf %{versmainlibdirbi64}/libgcc_s.so %{buildroot}/%{versmainlibdirbi64}/libgcc_s_64.so chmod a+x %{buildroot}/lib64/libgcc_s.so.%{libgcc_s} +%if 0%{?usrmerged} +mv %{buildroot}/lib64/libgcc_s.so.%{libgcc_s} %{buildroot}/%{slibdir64}/libgcc_s.so.%{libgcc_s} +%endif %endif %endif @@ -2518,6 +2537,7 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/mathdef.h 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 %if !%{enable_plugins} # no plugins rm -rf %{buildroot}/%{libsubdir}/plugin @@ -3004,15 +3024,15 @@ %files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix} %defattr(-,root,root) -/%{_lib}/libgcc_s.so.%{libgcc_s} +%{_slibdir}/libgcc_s.so.%{libgcc_s} %if %{biarch} %if %{build_primary_64bit} %if !%{separate_bi32} -/lib/libgcc_s.so.%{libgcc_s} +%{slibdir}/libgcc_s.so.%{libgcc_s} %endif %else %if !%{separate_bi64} -/lib64/libgcc_s.so.%{libgcc_s} +%{slibdir64}/libgcc_s.so.%{libgcc_s} %endif %endif %endif @@ -3020,13 +3040,13 @@ %if %{separate_bi64} %files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-64bit %defattr(-,root,root) -/lib64/libgcc_s.so.%{libgcc_s} +%{slibdir64}/libgcc_s.so.%{libgcc_s} %endif %if %{separate_bi32} %files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit %defattr(-,root,root) -/lib/libgcc_s.so.%{libgcc_s} +%{slibdir}/libgcc_s.so.%{libgcc_s} %endif %files -n libgomp%{libgomp_sover}%{libgomp_suffix} @@ -3408,6 +3428,7 @@ %endif %endif +%if %{build_jit} %files -n libgccjit%{libgccjit_sover}%{libgccjit_suffix} %defattr(-,root,root) %{_prefix}/%{_lib}/libgccjit.so.%{libgccjit_sover}* @@ -3418,6 +3439,7 @@ %{_prefix}/include/libgccjit.h %{_prefix}/include/libgccjit++.h %{_infodir}/libgccjit.info.gz +%endif %if 0%{?run_tests:1} %files -n gcc11-testresults ++++++ gcc-11.0.0+git182924.tar.xz -> gcc-11.0.0+git183291.tar.xz ++++++ /work/SRC/openSUSE:Factory/gcc11/gcc-11.0.0+git182924.tar.xz /work/SRC/openSUSE:Factory/.gcc11.new.28504/gcc-11.0.0+git183291.tar.xz differ: char 15, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.NPlwa5/_old 2021-02-11 12:45:39.329337583 +0100 +++ /var/tmp/diff_new_pack.NPlwa5/_new 2021-02-11 12:45:39.329337583 +0100 @@ -17,6 +17,15 @@ # nospeccleaner +%if !0%{?usrmerged} +%define _slibdir /%{_lib} +%define slibdir /lib +%define slibdir64 /lib64 +%else +%define _slibdir %{_libdir} +%define slibdir %{_prefix}/lib +%define slibdir64 %{_libdir} +%endif # Ada currently fails to build on a few platforms, enable it only # on those that work @@ -278,7 +287,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: https://gcc.gnu.org/ -Version: 11.0.0+git182924 +Version: 11.0.0+git183291 Release: 1 %define gcc_dir_version %(echo %version | sed 's/+.*//' | cut -d '.' -f 1) %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/') @@ -465,7 +474,7 @@ # PACKAGE-BEGIN %package -n libstdc++%{libstdcxx_sover}-devel%{libdevel_suffix}@variant@ Summary: Include Files and Libraries mandatory for Development -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Requires: libstdc++%{libstdcxx_sover}@variant@ >= %{version}-%{release} Requires: glibc-devel@variant@ @@ -507,7 +516,7 @@ # PACKAGE-BEGIN %package -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}@variant@ Summary: C compiler runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgcc_s%{libgcc_s}@variant@ = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -525,7 +534,7 @@ # PACKAGE-BEGIN %package -n libgomp%{libgomp_sover}%{libgomp_suffix}@variant@ Summary: The GNU compiler collection OpenMP runtime library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Base Provides: libgomp%{libgomp_sover}@variant@ = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -547,7 +556,7 @@ # PACKAGE-BEGIN %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}@variant@ Summary: The standard C++ shared library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Suggests: libstdc++%{libstdcxx_sover}-locale Provides: libstdc++%{libstdcxx_sover}@variant@ = %{version}-%{release} @@ -566,7 +575,7 @@ %package -n libstdc++%{libstdcxx_sover}%{libstdcxx_suffix}-locale Summary: Standard C++ Library Locales -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Provides: libstdc++%{libstdcxx_sover}-locale = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -609,7 +618,7 @@ # PACKAGE-BEGIN %package -n libobjc%{libobjc_sover}%{libobjc_suffix}@variant@ Summary: Library for the GNU Objective C Compiler -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Libraries/Other Provides: libobjc%{libobjc_sover}@variant@ = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -667,7 +676,7 @@ # PACKAGE-BEGIN %package -n libada@base_ver@@variant@ Summary: GNU Ada Runtime Libraries -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: System/Libraries Provides: libgnarl-@base_ver@@variant@ = %{version}-%{release} Conflicts: %selfconflict libgnarl-@base_ver@@variant@ @@ -706,7 +715,7 @@ # PACKAGE-BEGIN %package -n libgfortran%{libgfortran_sover}%{libgfortran_suffix}@variant@ Summary: The GNU Fortran Compiler Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/Fortran %ifarch %quadmath_arch Requires: libquadmath%{libquadmath_sover}@variant@ >= %{version}-%{release} @@ -825,7 +834,7 @@ # PACKAGE-BEGIN %package -n libatomic%{libatomic_sover}%{libatomic_suffix}@variant@ Summary: The GNU Compiler Atomic Operations Runtime Library -License: GPL-3.0-with-GCC-exception +License: GPL-3.0 WITH GCC-exception-3.1 Group: Development/Languages/C and C++ Provides: libatomic%{libatomic_sover}@variant@ = %{version}-%{release} # Only one package may provide this - allows multiple gcc versions @@ -1696,6 +1705,9 @@ mv %{buildroot}/%{_lib}/libgcc_s.so %{buildroot}/%{versmainlibdir}/ fi chmod a+x %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s} +%if 0%{?usrmerged} +mv %{buildroot}/%{_lib}/libgcc_s.so.%{libgcc_s} %{buildroot}/%{_slibdir}/libgcc_s.so.%{libgcc_s} +%endif %if %{biarch} %if %{build_primary_64bit} if test -L %{buildroot}/lib/libgcc_s.so; then @@ -1706,6 +1718,9 @@ fi ln -sf %{versmainlibdirbi32}/libgcc_s.so %{buildroot}/%{versmainlibdirbi32}/libgcc_s_32.so chmod a+x %{buildroot}/lib/libgcc_s.so.%{libgcc_s} +%if 0%{?usrmerged} +mv %{buildroot}/lib/libgcc_s.so.%{libgcc_s} %{buildroot}/%{slibdir}/libgcc_s.so.%{libgcc_s} +%endif %else # 32-bit biarch systems if test -L %{buildroot}/lib64/libgcc_s.so; then @@ -1716,6 +1731,9 @@ fi ln -sf %{versmainlibdirbi64}/libgcc_s.so %{buildroot}/%{versmainlibdirbi64}/libgcc_s_64.so chmod a+x %{buildroot}/lib64/libgcc_s.so.%{libgcc_s} +%if 0%{?usrmerged} +mv %{buildroot}/lib64/libgcc_s.so.%{libgcc_s} %{buildroot}/%{slibdir64}/libgcc_s.so.%{libgcc_s} +%endif %endif %endif @@ -1770,6 +1788,7 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/mathdef.h 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 %if !%{enable_plugins} # no plugins rm -rf %{buildroot}/%{libsubdir}/plugin @@ -2258,15 +2277,15 @@ %files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix} %defattr(-,root,root) -/%{_lib}/libgcc_s.so.%{libgcc_s} +%{_slibdir}/libgcc_s.so.%{libgcc_s} %if %{biarch} %if %{build_primary_64bit} %if !%{separate_bi32} -/lib/libgcc_s.so.%{libgcc_s} +%{slibdir}/libgcc_s.so.%{libgcc_s} %endif %else %if !%{separate_bi64} -/lib64/libgcc_s.so.%{libgcc_s} +%{slibdir64}/libgcc_s.so.%{libgcc_s} %endif %endif %endif @@ -2274,13 +2293,13 @@ %if %{separate_bi64} %files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-64bit %defattr(-,root,root) -/lib64/libgcc_s.so.%{libgcc_s} +%{slibdir64}/libgcc_s.so.%{libgcc_s} %endif %if %{separate_bi32} %files -n libgcc_s%{libgcc_s}%{libgcc_s_suffix}-32bit %defattr(-,root,root) -/lib/libgcc_s.so.%{libgcc_s} +%{slibdir}/libgcc_s.so.%{libgcc_s} %endif @@ -2674,6 +2693,7 @@ %endif %endif +%if %{build_jit} %files -n libgccjit%{libgccjit_sover}%{libgccjit_suffix} %defattr(-,root,root) %{_prefix}/%{_lib}/libgccjit.so.%{libgccjit_sover}* @@ -2684,6 +2704,7 @@ %{_prefix}/include/libgccjit.h %{_prefix}/include/libgccjit++.h %{_infodir}/libgccjit.info.gz +%endif # GCC-TESTSUITE-DELETE-END
