From 753d4b61f2525475e052c58e2977f5020b618a06 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 22:37:51 +0100 Subject: [PATCH] add legacy provides to libgcc_s.so.1 [release 9.2.0-2mamba;Wed Aug 28 2019] --- gcc.spec | 193 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 138 insertions(+), 55 deletions(-) diff --git a/gcc.spec b/gcc.spec index 0f13066..04f3574 100644 --- a/gcc.spec +++ b/gcc.spec @@ -39,8 +39,8 @@ %define majver %(echo %version | cut -d. -f 1-2) Name: gcc -Version: 8.3.0 -Release: 3mamba +Version: 9.2.0 +Release: 2mamba Summary: GNU Compiler Collection (C, C++, Fortran, Go, Ada) Group: Applications/Development Vendor: openmamba @@ -77,9 +77,9 @@ BuildRequires: cross-%{_target_platform}-binutils %if "%{?stage1}" == "1" BuildRequires: cross-%{_target_platform}-glibc-stage1 %endif -%if "%{?stage2}" == "1" -BuildRequires: cross-%{_target_platform}-glibc-stage2 -%endif +#%if "%{?stage2}" == "1" +#BuildRequires: cross-%{_target_platform}-glibc-stage2 +#%endif %if "%{?stage1}" != "1" %if "%{?stage2}" != "1" %if "%{target_cpu}" != "avr" @@ -133,6 +133,21 @@ This package is required for all other GCC compilers, namely C++, Fortran, Objec %package -n gcc-multilib Summary: gcc multilib package for building 32 bit applications on x86_64 architecture Group: Applications/Development +Provides: libgcc_s.so.1 +Provides: libgcc_s.so.1(GCC_3.0) +Provides: libgcc_s.so.1(GCC_3.3) +Provides: libgcc_s.so.1(GCC_3.3.1) +Provides: libgcc_s.so.1(GCC_3.4) +Provides: libgcc_s.so.1(GCC_3.4.2) +Provides: libgcc_s.so.1(GCC_4.0.0) +Provides: libgcc_s.so.1(GCC_4.2.0) +Provides: libgcc_s.so.1(GCC_4.3.0) +Provides: libgcc_s.so.1(GCC_4.4.0) +Provides: libgcc_s.so.1(GCC_4.5.0) +Provides: libgcc_s.so.1(GCC_4.7.0) +Provides: libgcc_s.so.1(GCC_4.8.0) +Provides: libgcc_s.so.1(GCC_7.0.0) +Provides: libgcc_s.so.1(GLIBC_2.0) %description -n gcc-multilib gcc multilib package for building 32 bit applications on x86_64 architecture. @@ -143,6 +158,54 @@ gcc multilib package for building 32 bit applications on x86_64 architecture. %package -n libgcc Summary: GNU C Library Group: System/Libraries +%ifarch x86_64 +Provides: libgcc_s.so.1()(64bit) +Provides: libgcc_s.so.1(GCC_3.0)(64bit) +Provides: libgcc_s.so.1(GCC_3.3)(64bit) +Provides: libgcc_s.so.1(GCC_3.3.1)(64bit) +Provides: libgcc_s.so.1(GCC_3.4)(64bit) +Provides: libgcc_s.so.1(GCC_3.4.2)(64bit) +Provides: libgcc_s.so.1(GCC_3.4.4)(64bit) +Provides: libgcc_s.so.1(GCC_4.0.0)(64bit) +Provides: libgcc_s.so.1(GCC_4.2.0)(64bit) +Provides: libgcc_s.so.1(GCC_4.3.0)(64bit) +Provides: libgcc_s.so.1(GCC_4.7.0)(64bit) +Provides: libgcc_s.so.1(GCC_4.8.0)(64bit) +Provides: libgcc_s.so.1(GCC_7.0.0)(64bit) +%endif +%ifarch %{ix86} +Provides: libgcc_s.so.1 +Provides: libgcc_s.so.1(GCC_3.0) +Provides: libgcc_s.so.1(GCC_3.3) +Provides: libgcc_s.so.1(GCC_3.3.1) +Provides: libgcc_s.so.1(GCC_3.4) +Provides: libgcc_s.so.1(GCC_3.4.2) +Provides: libgcc_s.so.1(GCC_4.0.0) +Provides: libgcc_s.so.1(GCC_4.2.0) +Provides: libgcc_s.so.1(GCC_4.3.0) +Provides: libgcc_s.so.1(GCC_4.4.0) +Provides: libgcc_s.so.1(GCC_4.5.0) +Provides: libgcc_s.so.1(GCC_4.7.0) +Provides: libgcc_s.so.1(GCC_4.8.0) +Provides: libgcc_s.so.1(GCC_7.0.0) +Provides: libgcc_s.so.1(GLIBC_2.0) +%endif +%ifarch arm +Provides: libgcc_s.so.1 +Provides: libgcc_s.so.1(GCC_3.0) +Provides: libgcc_s.so.1(GCC_3.3) +Provides: libgcc_s.so.1(GCC_3.3.1) +Provides: libgcc_s.so.1(GCC_3.3.4) +Provides: libgcc_s.so.1(GCC_3.4) +Provides: libgcc_s.so.1(GCC_3.4.2) +Provides: libgcc_s.so.1(GCC_3.5) +Provides: libgcc_s.so.1(GCC_4.0.0) +Provides: libgcc_s.so.1(GCC_4.2.0) +Provides: libgcc_s.so.1(GCC_4.3.0) +Provides: libgcc_s.so.1(GCC_4.7.0) +Provides: libgcc_s.so.1(GCC_7.0.0) +Provides: libgcc_s.so.1(GLIBC_2.0) +%endif %description -n libgcc The libgcc package contains GCC shared libraries for gcc %{gcc_branch}. @@ -532,11 +595,11 @@ cp libgo/go/internal/syscall/unix/{getrandom_linux_arm.go,dummy.go} %build #:<< ____EOF -rm -rf ../%{name}-build +rm -rf ../%{name}-build-%{_target_platform} #____EOF -mkdir -p ../%{name}-build +mkdir -p ../%{name}-build-%{_target_platform} -cd ../%{name}-build +cd ../%{name}-build-%{_target_platform} slibdir=%{_libdir} @@ -582,7 +645,7 @@ case %{_target_platform} in %if "%{_target_platform}" != "%{_host}" ADDITIONAL_OPTS="--with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib" %else - ADDITIONAL_OPTS="--with-slibdir=$slibdir" + ADDITIONAL_OPTS="--with-slibdir=$slibdir --enable-multilib" %endif ;; *) @@ -631,6 +694,9 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \ --build=%{_build} \ --target=%{_target_platform} \ --enable-shared \ + --enable-lto \ + --enable-linker-build-id \ + --enable-plugin \ --enable-languages=$BUILD_LANGUAGES \ %if "%{target_cpu}" != "avr" --enable-threads=posix \ @@ -644,6 +710,7 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \ %endif %if "%{_target_platform}" != "%{_host}" --enable-symvers=gnu \ + --disable-libsanitizer \ --with-local-prefix=/usr/%{_target_platform} \ %else --enable-install-libiberty \ @@ -670,8 +737,15 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \ make %{?_smp_mflags} CFLAGS='-O -I/usr/include/freetype2' LIBCFLAGS='-g -O2' \ LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap %endif + +%if "%{target_cpu}" != "avr" %if "%{disable_doc}" != "1" - make pdf || make pdf +# Make generated doxygen pages. +make -C %{_target_platform}/libstdc++-v3 doc-html-doxygen +make -C %{_target_platform}/libstdc++-v3 doc-man-doxygen +cd ../.. +# make pdf || make pdf +%endif %endif %endif # stage1 = 1 @@ -679,7 +753,7 @@ CROSS_SYSTEM_HEADER_DIR=/usr/%{_target_platform}/include \ %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -cd ../%{name}-build +cd ../%{name}-build-%{_target_platform} make DESTDIR=%{buildroot} install %if "%{_target_platform}" == "%{_host}" @@ -715,9 +789,9 @@ ln -s gcc %{buildroot}/usr/bin/cc # # copy PDF gcc documentation to builddir for use with %doc # -%if "%{disable_doc}" != "1" -cp gcc/doc/*.pdf %{_builddir}/gcc-%{version}%{?gcc_extraver}/gcc/doc/ -%endif +#%if "%{disable_doc}" != "1" +#cp gcc/doc/*.pdf %{_builddir}/gcc-%{version}%{?gcc_extraver}/gcc/doc/ +#%endif # FIXME: since 4.5.0 this file causes an annoying warning with ldconfig if installed in /usr/lib mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_libdir} @@ -757,10 +831,10 @@ rm -f %{buildroot}%{_libdir}/nof/libffi* rm -f %{buildroot}%{_mandir}/man3/ffi*.3* rm -f %{buildroot}%{_infodir}/libffi.info* -# don't strip libraries for avr -%if "%{target_cpu}" == "avr" -find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; -%endif +## don't strip libraries for avr +#%if "%{target_cpu}" == "avr" +#find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; +#%endif %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -1017,22 +1091,22 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; #%{_libdir}/libcilkrts.so #%{_libdir}/libcilkrts.spec -%ifnarch arm -%files -n libmpx -%defattr(-,root,root) -%{_libdir}/libmpx.so.* -%{_libdir}/libmpxwrappers.so.* - -%files -n libmpx-devel -%defattr(-,root,root) -%{_libdir}/libmpx.a -%{_libdir}/libmpx.la -%{_libdir}/libmpx.so -%{_libdir}/libmpx.spec -%{_libdir}/libmpxwrappers.a -%{_libdir}/libmpxwrappers.la -%{_libdir}/libmpxwrappers.so -%endif +#%ifnarch arm +#%files -n libmpx +#%defattr(-,root,root) +#%{_libdir}/libmpx.so.* +#%{_libdir}/libmpxwrappers.so.* +# +#%files -n libmpx-devel +#%defattr(-,root,root) +#%{_libdir}/libmpx.a +#%{_libdir}/libmpx.la +#%{_libdir}/libmpx.so +#%{_libdir}/libmpx.spec +#%{_libdir}/libmpxwrappers.a +#%{_libdir}/libmpxwrappers.la +#%{_libdir}/libmpxwrappers.so +#%endif %files -n libubsan %defattr(-,root,root) @@ -1107,18 +1181,18 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %{_libdir}/libgfortran.a %{_libdir}/libgfortran.la %{_libdir}/libgfortran.so +%{_libdir}/libgfortran.spec %ifarch ppc %{_libdir}/nof/libgfortran.a %{_libdir}/nof/libgfortran.la %{_libdir}/nof/libgfortran.so %endif %{_mandir}/man1/gfortran.1.* -%doc gcc/fortran/ChangeLog +#%doc gcc/fortran/ChangeLog %files -n libgfortran %defattr(-,root,root) %{_libdir}/libgfortran.so.* -%{_libdir}/libgfortran.spec %ifarch ppc %{_libdir}/nof/libgfortran.so.* %endif @@ -1177,16 +1251,16 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %if "%{disable_fortran}" != "1" %{_infodir}/gfortran.info.* %if "%{disable_doc}" != "1" -%doc gcc/doc/gfortran.pdf +#%doc gcc/doc/gfortran.pdf %endif %endif %{_infodir}/libquadmath.info.* %if "%{disable_doc}" != "1" -%doc gcc/doc/cpp.pdf -%doc gcc/doc/cppinternals.pdf -%doc gcc/doc/gccinstall.pdf -%doc gcc/doc/gcc.pdf -%doc gcc/doc/gccint.pdf +#%doc gcc/doc/cpp.pdf +#%doc gcc/doc/cppinternals.pdf +#%doc gcc/doc/gccinstall.pdf +#%doc gcc/doc/gcc.pdf +#%doc gcc/doc/gccint.pdf %endif # "%{disable_doc}" != "1" # @@ -1252,11 +1326,11 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; /usr/lib/libitm.so /usr/lib/libitm.so.* /usr/lib/libitm.spec -/usr/lib/libmpx*.a -/usr/lib/libmpx*.la -/usr/lib/libmpx*.so -/usr/lib/libmpx*.so.* -/usr/lib/libmpx.spec +#/usr/lib/libmpx*.a +#/usr/lib/libmpx*.la +#/usr/lib/libmpx*.so +#/usr/lib/libmpx*.so.* +#/usr/lib/libmpx.spec /usr/lib/libobjc.a /usr/lib/libobjc.la /usr/lib/libobjc.so @@ -1327,6 +1401,15 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; %endif # cross-platform %changelog +* Wed Aug 28 2019 Silvan Calarco 9.2.0-2mamba +- add legacy provides to libgcc_s.so.1 + +* Sun Aug 18 2019 Automatic Build System 9.2.0-1mamba +- automatic version update by autodist + +* Thu Aug 01 2019 Automatic Build System 9.1.0-1mamba +- automatic version update by autodist + * Mon Mar 18 2019 Silvan Calarco 8.3.0-3mamba - fix for liblto_plugin.so link added in previous release @@ -1537,10 +1620,10 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; - description of libffi corrected - removed requirements for gcc in gcc-java and gcc-fortran -* Mon Aug 23 2005 Silvan Calarco 4.0.1-4qilnx +* Tue Aug 23 2005 Silvan Calarco 4.0.1-4qilnx - rebuilt with fixincludes script disabled -* Sun Aug 22 2005 Silvan Calarco 4.0.1-3qilnx +* Mon Aug 22 2005 Silvan Calarco 4.0.1-3qilnx - first ppc full cross-platform compiler build * Wed Aug 17 2005 Silvan Calarco 4.0.1-2qilnx @@ -1564,7 +1647,7 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; - fixed package group - added missing symlinks -* Tue Nov 15 2004 Davide Madrisan 3.4.3-1qilnx +* Mon Nov 15 2004 Davide Madrisan 3.4.3-1qilnx - updated to gcc-3.4.3 * Wed Sep 15 2004 Davide Madrisan 3.4.2-2qilnx @@ -1588,21 +1671,21 @@ find %{buildroot}%{_libdir}/gcc -name lib*.a -exec chmod -w {} \; * Fri May 16 2003 Silvan Calarco 3.2.2-7qilnx - added libstdc++.so symlink in devel package -* Mon Apr 24 2003 Silvan Calarco 3.2.2-6qilnx +* Thu Apr 24 2003 Silvan Calarco 3.2.2-6qilnx - added symlinks /usr/lib/cpp and /usr/bin/cc -* Mon Apr 24 2003 Silvan Calarco 3.2.2-5qilnx +* Thu Apr 24 2003 Silvan Calarco 3.2.2-5qilnx - added symlink /lib/cpp -* Mon Apr 17 2003 Silvan Calarco 3.2.2-4qilnx +* Thu Apr 17 2003 Silvan Calarco 3.2.2-4qilnx - fixed install problems by using make install DESTDIR=xxxx -* Mon Apr 16 2003 Silvan Calarco 3.2.2-3qilnx +* Wed Apr 16 2003 Silvan Calarco 3.2.2-3qilnx - changed %%dir reference to system dirs with more specific file lists - added -doc package * Mon Apr 14 2003 Silvan Calarco 3.2.2-2qilnx - changed all .bz2 occurences with * -* Tue Apr 09 2003 Silvan Calarco 3.2.2-1qilnx +* Wed Apr 09 2003 Silvan Calarco 3.2.2-1qilnx - first build for 3.2.2