diff --git a/gcc.spec b/gcc.spec index 9a8a40a..3acf425 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,7 +1,3 @@ -# openmamba cross platform gcc specfile -#%define git_commit 9a167ee2f8b9a0859fbab6cfdc276cf1f272effe -#%define git_commit_ver 13.1.1 - %define target_cpu %(echo %{_target_platform} | cut -d- -f1) %if "%{?_target_platform}" != "%{_host}" # % define target_platform %{cross_target_cpu}-openmamba-linux-gnu @@ -18,8 +14,7 @@ %define _ld ld %endif -%define gcc_branch %(echo %{version} | cut -d. -f 1-2) -#% define gcc_extraver -20050810 +%define gcc_ver %(echo %{version} | cut -d. -f 1-3) # use stage1 == 1 to have a gcc build not depending on # glibc library; this is usually the first needed step in @@ -35,13 +30,14 @@ # % define bootstrap_append -stage2 #% endif +%define gittag %(echo %version | cut -d. -f5) %define libstdcxx_name libstdc++6 %define MAJver %(echo %version | cut -d. -f 1) %define majver %(echo %version | cut -d. -f 1-2) Name: gcc -Version: 14.1.0 +Version: 14.1.1.20240615git.a4f8e9e Release: 1mamba Summary: GNU Compiler Collection (C, C++, Fortran, Go, Ada) Group: Applications/Development @@ -49,11 +45,19 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://gcc.gnu.org/ -Source: https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz +Source: https://sourceware.org/git/gcc.git/releases%2Fgcc-14@%{gittag}/gcc-%{version}.tar.bz2 +#Source: https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz Patch0: gcc-10.1.0-arm-provide-futex-atomic-functions.patch Patch1: gcc-13.1.1-libgomp-workaround-null-environ.patch License: GPL ## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libgmp-devel +BuildRequires: libisl-devel +BuildRequires: libmpc-devel +BuildRequires: libmpfr-devel +BuildRequires: libz-devel +BuildRequires: libzstd-devel ## AUTOBUILDREQ-END %if "%{?cross_target_cpu}" == "" BuildRequires: binutils @@ -187,7 +191,7 @@ Provides: libgcc_s.so.1(GLIBC_2.0) %endif %description -n libgcc -The libgcc package contains GCC shared libraries for gcc %{gcc_branch}. +The libgcc package contains GCC shared libraries for gcc. # # Preprocessor @@ -621,6 +625,9 @@ __EOF # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in +# 14.1.1: from Fedora, trying to fix aarch64 problems +sed -i -e '/ldp_fusion/s/Init(1)/Init(0)/' gcc/config/aarch64/aarch64.opt + %build #:<< ____EOF rm -rf ../%{name}-build-%{_target_platform} @@ -652,9 +659,6 @@ case %{_target_platform} in i386-*|i486-*|i586-*|i686-*|athlon-*) ADDITIONAL_OPTS="--with-arch=pentium4" ;; - ppc-* | powerpc-*) - ADDITIONAL_OPTS="" - ;; arm-*) abi=%{_target_platform} abi=`echo ${abi/*-}` @@ -810,8 +814,6 @@ for p in gcc-%{version} gcc gcc-ar gcc-nm gcc-ranlib c++ g++ gfortran; do rm -f %{buildroot}%{_bindir}/%{_target_platform}-$p done -ln -s gcc %{buildroot}%{_bindir}/%{_target_platform}-gcc-%{version} - for p in gcc gcc-ar gcc-nm gcc-ranlib cc gcov c++ g++ gfortran; do ln -s $p %{buildroot}%{_bindir}/%{_target_platform}-$p done @@ -820,7 +822,7 @@ done mv %{buildroot}%{_bindir}/go %{buildroot}%{_bindir}/gcc-go install -d -m755 %{buildroot}%{_libdir}/bfd-plugins -ln -sf ../../libexec/gcc/%{_target_platform}/%{version}/liblto_plugin.so %{buildroot}%{_libdir}/bfd-plugins/ +ln -sf ../../libexec/gcc/%{_target_platform}/%{gcc_ver}/liblto_plugin.so %{buildroot}%{_libdir}/bfd-plugins/ # create symlinks # mkdir -p %{buildroot}/%{_lib} @@ -878,7 +880,7 @@ chmod 755 %{buildroot}/%{_libdir}/libgcc_s.so.1 rm -rf %{buildroot}%{_infodir}/* rm -rf %{buildroot}%{_mandir}/man7/{fsf-funding.*,gfdl.*,gpl.*} rm -rf %{buildroot}%{_datadir}/locale/* - rm -rf %{buildroot}%{_datadir}/gcc-%{version}/python/libstdcxx/* + rm -rf %{buildroot}%{_datadir}/gcc-%{gcc_ver}/python/libstdcxx/* # FIXME: since 5.2.0 rm -rf %{buildroot}%{_libdir}/libcc1.* %endif @@ -958,7 +960,7 @@ rm -f %{buildroot}%{_infodir}/dir %{_bindir}/gcov-tool %{_bindir}/lto-dump %{_bindir}/%{_target_platform}-cc -%{_bindir}/%{_target_platform}-gcc-%{version} +%{_bindir}/%{_target_platform}-gcc-%{gcc_ver} %{_bindir}/%{_target_platform}-gcc %{_bindir}/%{_target_platform}-gcc-ar %{_bindir}/%{_target_platform}-gcc-nm @@ -967,14 +969,11 @@ rm -f %{buildroot}%{_infodir}/dir %dir %{_libdir}/gcc %{_libdir}/gcc/* %ifarch x86_64 aarch64 -%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/32/* +%exclude %{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/32/* %endif -%dir %{_prefix}/libexec/gcc/%{_target_platform}/%{version} -%{_prefix}/libexec/gcc/%{_target_platform}/%{version}/* +%dir %{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_ver} +%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_ver}/* %{_libdir}/bfd-plugins/liblto_plugin.so -%{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py -%{_datadir}/gcc-%{version}/python/libstdcxx/v6/__init__.py -%{_datadir}/gcc-%{version}/python/libstdcxx/v6/printers.py %{_mandir}/man1/gcc.1.* %{_mandir}/man1/gcov.1.* %{_mandir}/man1/gcov-dump.1.* @@ -984,15 +983,12 @@ rm -f %{buildroot}%{_infodir}/dir %{_mandir}/man7/gfdl.7.* %{_mandir}/man7/gpl.7.* %doc gcc/{README*,*ChangeLog*} -%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/objc -%exclude %{_libdir}/gcc/%{_target_platform}/%{version}/include/ssp +%exclude %{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/include/objc +%exclude %{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/include/ssp %files -n libgcc %defattr(-,root,root) %{_libdir}/libgcc* -%ifarch ppc -%{_libdir}/nof/libgcc* -%endif %files cpp -f cpplib.lang %defattr(-,root,root) @@ -1028,59 +1024,36 @@ rm -f %{buildroot}%{_infodir}/dir %files -n libgomp %defattr(-,root,root) %{_libdir}/libgomp.so.* -%ifarch ppc -%{_libdir}/nof/libgomp.so.* -%endif %files -n libgomp-devel %defattr(-,root,root) %{_libdir}/libgomp.a %{_libdir}/libgomp.so %{_libdir}/libgomp.spec -%ifarch ppc -%{_libdir}/nof/libgomp.a -%{_libdir}/nof/libgomp.so -%{_libdir}/nof/libgomp.spec -%endif %{_datadir}/info/libgomp.info.gz %files -n libobjc %defattr(-,root,root) %{_libdir}/libobjc.so.* -%ifarch ppc -%{_libdir}/nof/libobjc.so.* -%endif %files -n libobjc-devel %defattr(-,root,root) %{_libdir}/libobjc.a %{_libdir}/libobjc.so -%ifarch ppc -%{_libdir}/nof/libobjc.a -%{_libdir}/nof/libobjc.so -%endif -%dir %{_libdir}/gcc/%{_target_platform}/%{version}/include/objc -%{_libdir}/gcc/%{_target_platform}/%{version}/include/objc/* +%dir %{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/include/objc +%{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/include/objc/* %files -n libssp %defattr(-,root,root) %{_libdir}/libssp.so.* -%ifarch ppc -%{_libdir}/nof/libssp.so.* -%endif %files -n libssp-devel %defattr(-,root,root) %{_libdir}/libssp.a %{_libdir}/libssp.so %{_libdir}/libssp_nonshared.a -%ifarch ppc -%{_libdir}/nof/libssp.a -%{_libdir}/nof/libssp.so -%{_libdir}/nof/libssp_nonshared.a -%endif -%dir %{_libdir}/gcc/%{_target_platform}/%{version}/include/ssp -%{_libdir}/gcc/%{_target_platform}/%{version}/include/ssp/* +%dir %{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/include/ssp +%{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/include/ssp/* %files -n libasan %defattr(-,root,root) @@ -1152,16 +1125,16 @@ rm -f %{buildroot}%{_infodir}/dir %{_bindir}/g++ %{_bindir}/%{_target_platform}-c++ %{_bindir}/%{_target_platform}-g++ -%{_datadir}/gcc-%{version}/python/libstdcxx/v6/xmethods.py %{_mandir}/man1/g++.1.* #%doc gcc/cp/ChangeLog* %files -n %{libstdcxx_name} %defattr(-,root,root) %{_libdir}/libstdc++.so.* -%ifarch ppc -%{_libdir}/nof/libstdc++.so.* -%endif +%dir %{_datadir}/gcc-%{gcc_ver}/python/libstdcx +%{_datadir}/gcc-%{gcc_ver}/python/libstdcxx/__init__.py +%dir %{_datadir}/gcc-%{gcc_ver}/python/libstdcx/v6 +%{_datadir}/gcc-%{gcc_ver}/python/libstdcxx/v6/*.py %files -n %{libstdcxx_name}-debug %defattr(-,root,root) @@ -1174,11 +1147,6 @@ rm -f %{buildroot}%{_infodir}/dir %{_libdir}/libstdc++.so %{_libdir}/libsupc++.a %{_libdir}/libstdc++fs.a -%ifarch ppc -%{_libdir}/nof/libstdc++.a -%{_libdir}/nof/libstdc++.so -%{_libdir}/nof/libsupc++.a -%endif %dir %{_includedir}/c++ %{_includedir}/c++/* #%doc libstdc++-v3/{ChangeLog*,README*,doc/html/} @@ -1215,18 +1183,11 @@ rm -f %{buildroot}%{_infodir}/dir %{_libdir}/libgfortran.a %{_libdir}/libgfortran.so %{_libdir}/libgfortran.spec -%ifarch ppc -%{_libdir}/nof/libgfortran.a -%{_libdir}/nof/libgfortran.so -%endif %{_mandir}/man1/gfortran.1.* %files -n libgfortran %defattr(-,root,root) %{_libdir}/libgfortran.so.* -%ifarch ppc -%{_libdir}/nof/libgfortran.so.* -%endif %endif %ifnarch arm aarch64 @@ -1258,8 +1219,8 @@ rm -f %{buildroot}%{_infodir}/dir %files -n libgo %defattr(-,root,root) %{_libdir}/libgo.so.* -%dir %{_libdir}/go/%{version}/%{_target_platform} -%{_libdir}/go/%{version}/%{_target_platform}/* +%dir %{_libdir}/go/%{gcc_ver}/%{_target_platform} +%{_libdir}/go/%{gcc_ver}/%{_target_platform}/* %files -n libgo-devel %defattr(-,root,root) @@ -1282,8 +1243,8 @@ rm -f %{buildroot}%{_infodir}/dir #%doc gcc/doc/gfortran.pdf %endif %endif +%ifnarch aarch64 %{_infodir}/libquadmath.info.* -%if "%{disable_doc}" != "1" %endif # @@ -1293,8 +1254,8 @@ rm -f %{buildroot}%{_infodir}/dir %files -n gcc-multilib %defattr(-,root,root) %{_sysconfdir}/ld.so.conf.d/lib32-gcc.conf -%dir %{_libdir}/gcc/%{_target_platform}/%{version}/32 -%{_libdir}/gcc/%{_target_platform}/%{version}/32/* +%dir %{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/32 +%{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/32/* %{_prefix}/lib32/libgcc_s.so %{_prefix}/lib32/libgcc_s.so.1 # @@ -1322,9 +1283,9 @@ rm -f %{buildroot}%{_infodir}/dir # go # %dir %{_prefix}/lib32/go -%dir %{_prefix}/lib32/go/%{version} -%dir %{_prefix}/lib32/go/%{version}/%{_target_platform} -%{_prefix}/lib32/go/%{version}/%{_target_platform}/* +%dir %{_prefix}/lib32/go/%{gcc_ver} +%dir %{_prefix}/lib32/go/%{gcc_ver}/%{_target_platform} +%{_prefix}/lib32/go/%{gcc_ver}/%{_target_platform}/* %{_prefix}/lib32/libgo.a %{_prefix}/lib32/libgo.so %{_prefix}/lib32/libgo.so.* @@ -1382,21 +1343,20 @@ rm -f %{buildroot}%{_infodir}/dir %{_prefix}/%{_target_platform}/lib/* %endif %endif -%if "%{target_cpu}" == "ppc" -%{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.a -%{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.a %endif -%endif -%{_libdir}/gcc/%{_target_platform}/%{version}/* +%{_libdir}/gcc/%{_target_platform}/%{gcc_ver}/* %if "%{target_cpu}" == "x86_64" -%{_libexecdir}/gcc/%{_target_platform}/%{version}/* +%{_libexecdir}/gcc/%{_target_platform}/%{gcc_ver}/* %else -%{_prefix}/libexec/gcc/%{_target_platform}/%{version}/* +%{_prefix}/libexec/gcc/%{_target_platform}/%{gcc_ver}/* %endif %{_mandir}/man1/%{_target_platform}-* %endif %changelog +* Mon Jun 17 2024 Automatic Build System 14.1.1.20240615git.a4f8e9e-1mamba +- update to 14.1.1.20240615git.a4f8e9e + * Thu May 09 2024 Silvan Calarco 14.1.0-1mamba - update to 14.1.0