rpms/gcc6
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move libgfortran.spec from libgfortran3 to gcc6-fortran pagacke to avoid conflicts with current gcc [release 6.4.0-4mamba;Fri Aug 30 2019]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 22:38:15 +01:00
parent 60000321ad
commit 9018ffdbfa
1 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gcc6.spec
View File

@ -34,6 +34,7 @@
%define disable_go 1 %define disable_go 1
#% define disable_fortran 1 #% define disable_fortran 1
%define disable_libs 1 %define disable_libs 1
%define disable_doc 1
#% if "%{?stage2}" == "1" #% if "%{?stage2}" == "1"
# % define bootstrap_append -stage2 # % define bootstrap_append -stage2
@ -48,7 +49,7 @@
Name: gcc6 Name: gcc6
Version: 6.4.0 Version: 6.4.0
Release: 3mamba Release: 4mamba
Summary: GNU Compiler Collection (C, C++, Fortran, Java, Ada) Summary: GNU Compiler Collection (C, C++, Fortran, Java, Ada)
Group: Applications/Development Group: Applications/Development
Vendor: openmamba Vendor: openmamba
@ -498,26 +499,6 @@ Requires: libcilkrts = %{version}-%{release}
%description -n libcilkrts-devel %description -n libcilkrts-devel
This package contains static libraries and headers to be used for development. This package contains static libraries and headers to be used for development.
%package -n libmpx
Summary: GCC MPX library
Group: System/Libraries
%description -n libmpx
This package contains the GCC MPX library.
%package -n libmpx-devel
Summary: libmpx development libraries and headers
Group: Development/Libraries
Requires: libmpx = %{version}-%{release}
%description -n libmpx-devel
This package contains static libraries and headers to be used for development.
%package -n libcilkrts
Summary: GCC Cilk runtime library
Group: System/Libraries
%package -n libubsan %package -n libubsan
Summary: GCC Undefined Behavior Sanitizer library Summary: GCC Undefined Behavior Sanitizer library
Group: System/Libraries Group: System/Libraries
@ -575,6 +556,7 @@ Cross Platform gcc for %{_target_platform}.
%setup -q -n gcc-%{version}%{?gcc_extraver} %setup -q -n gcc-%{version}%{?gcc_extraver}
#-D -T #-D -T
#:<< ___EOF #:<< ___EOF
%define _default_patch_fuzz 2
%patch2 -p0 %patch2 -p0
sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in} sed -i -e 's/libjawt/libgcjawt/g' libjava/Makefile.{am,in}
@ -662,7 +644,7 @@ case %{_target_platform} in
%if "%{_target_platform}" != "%{_host}" %if "%{_target_platform}" != "%{_host}"
ADDITIONAL_OPTS="--disable-libjava-multilib --with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib" ADDITIONAL_OPTS="--disable-libjava-multilib --with-slibdir=/usr/%{_target_platform}/lib64 --disable-multilib"
%else %else
ADDITIONAL_OPTS="--with-slibdir=$slibdir" ADDITIONAL_OPTS="--with-slibdir=$slibdir --disable-multilib"
%endif %endif
;; ;;
*) *)
@ -835,14 +817,15 @@ install -m0755 %{SOURCE2} %{buildroot}%{_bindir}/ecj1
cp gcc/doc/*.pdf %{_builddir}/gcc-%{version}%{?gcc_extraver}/gcc/doc/ cp gcc/doc/*.pdf %{_builddir}/gcc-%{version}%{?gcc_extraver}/gcc/doc/
%endif %endif
# FIXME: since 4.5.0 this file causes an annoying warning with ldconfig if installed in /usr/lib ## 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} mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_libdir}
mv %{buildroot}%{_libdir}/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/auto-load/%{_libdir}/ mv %{buildroot}%{_libdir}/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/auto-load/%{_libdir}/
%ifarch x86_64
# fix for 32bit multilib build #%ifarch x86_64
mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/lib ## fix for 32bit multilib build
mv %{buildroot}%{_prefix}/lib/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/lib/ #mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/lib
%endif #mv %{buildroot}%{_prefix}/lib/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/lib/
#%endif
(cd ../gcc-%{version}%{?gcc_extraver} (cd ../gcc-%{version}%{?gcc_extraver}
%find_lang gcc %find_lang gcc
@ -1437,6 +1420,7 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
%{_libdir}/libgfortran.a %{_libdir}/libgfortran.a
%{_libdir}/libgfortran.la %{_libdir}/libgfortran.la
%{_libdir}/libgfortran.so %{_libdir}/libgfortran.so
%{_libdir}/libgfortran.spec
%ifarch ppc %ifarch ppc
%{_libdir}/nof/libgfortran.a %{_libdir}/nof/libgfortran.a
%{_libdir}/nof/libgfortran.la %{_libdir}/nof/libgfortran.la
@ -1448,7 +1432,6 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
%files -n libgfortran3 %files -n libgfortran3
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libgfortran.so.* %{_libdir}/libgfortran.so.*
%{_libdir}/libgfortran.spec
%ifarch ppc %ifarch ppc
%{_libdir}/nof/libgfortran.so.* %{_libdir}/nof/libgfortran.so.*
%endif %endif
@ -1485,7 +1468,6 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
%{_libdir}/libnetgo.a %{_libdir}/libnetgo.a
%endif %endif
%if "%{disable_doc}" != "1"
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
%{_infodir}/cpp.info.* %{_infodir}/cpp.info.*
@ -1495,15 +1477,20 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
%{_infodir}/gccint.info.* %{_infodir}/gccint.info.*
%if "%{disable_java}" != "1" %if "%{disable_java}" != "1"
%{_infodir}/gcj.info.* %{_infodir}/gcj.info.*
%if "%{disable_doc}" != "1"
%doc gcc/doc/gcj.pdf %doc gcc/doc/gcj.pdf
%endif %endif
%endif
%if "%{disable_fortran}" != "1" %if "%{disable_fortran}" != "1"
%{_infodir}/gfortran.info.* %{_infodir}/gfortran.info.*
%if "%{disable_doc}" != "1"
%doc gcc/doc/gfortran.pdf %doc gcc/doc/gfortran.pdf
%endif %endif
%endif
%if "%{disable_libs}" != "1" %if "%{disable_libs}" != "1"
%{_infodir}/libquadmath.info.* %{_infodir}/libquadmath.info.*
%endif %endif
%if "%{disable_doc}" != "1"
%doc gcc/doc/cpp.pdf %doc gcc/doc/cpp.pdf
%doc gcc/doc/cppinternals.pdf %doc gcc/doc/cppinternals.pdf
%doc gcc/doc/gccinstall.pdf %doc gcc/doc/gccinstall.pdf
@ -1514,7 +1501,7 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
# #
# Multilib # Multilib
# #
%ifarch x86_64 %ifarch x86_64_legacy_disabled
%files -n %{name}-multilib %files -n %{name}-multilib
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/gcc/%{_target_platform}/%{version}/32 %dir %{_libdir}/gcc/%{_target_platform}/%{version}/32
@ -1671,6 +1658,9 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
%endif # cross-platform %endif # cross-platform
%changelog %changelog
* Fri Aug 30 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.0-4mamba
- move libgfortran.spec from libgfortran3 to gcc6-fortran pagacke to avoid conflicts with current gcc
* Tue Apr 24 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.0-3mamba * Tue Apr 24 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.0-3mamba
- gcc6-java: provide gcc-java - gcc6-java: provide gcc-java
@ -1869,10 +1859,10 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
- description of libffi corrected - description of libffi corrected
- removed requirements for gcc in gcc-java and gcc-fortran - removed requirements for gcc in gcc-java and gcc-fortran
* Mon Aug 23 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-4qilnx * Tue Aug 23 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-4qilnx
- rebuilt with fixincludes script disabled - rebuilt with fixincludes script disabled
* Sun Aug 22 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-3qilnx * Mon Aug 22 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-3qilnx
- first ppc full cross-platform compiler build - first ppc full cross-platform compiler build
* Wed Aug 17 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-2qilnx * Wed Aug 17 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1-2qilnx
@ -1896,7 +1886,7 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
- fixed package group - fixed package group
- added missing symlinks - added missing symlinks
* Tue Nov 15 2004 Davide Madrisan <davide.madrisan@qilinux.it> 3.4.3-1qilnx * Mon Nov 15 2004 Davide Madrisan <davide.madrisan@qilinux.it> 3.4.3-1qilnx
- updated to gcc-3.4.3 - updated to gcc-3.4.3
* Wed Sep 15 2004 Davide Madrisan <davide.madrisan@qilinux.it> 3.4.2-2qilnx * Wed Sep 15 2004 Davide Madrisan <davide.madrisan@qilinux.it> 3.4.2-2qilnx
@ -1920,21 +1910,21 @@ rm -f %{buildroot}%{_infodir}/libquadmath.*
* Fri May 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-7qilnx * Fri May 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-7qilnx
- added libstdc++.so symlink in devel package - added libstdc++.so symlink in devel package
* Mon Apr 24 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-6qilnx * Thu Apr 24 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-6qilnx
- added symlinks /usr/lib/cpp and /usr/bin/cc - added symlinks /usr/lib/cpp and /usr/bin/cc
* Mon Apr 24 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-5qilnx * Thu Apr 24 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-5qilnx
- added symlink /lib/cpp - added symlink /lib/cpp
* Mon Apr 17 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-4qilnx * Thu Apr 17 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-4qilnx
- fixed install problems by using make install DESTDIR=xxxx - fixed install problems by using make install DESTDIR=xxxx
* Mon Apr 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-3qilnx * Wed Apr 16 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-3qilnx
- changed %%dir reference to system dirs with more specific file lists - changed %%dir reference to system dirs with more specific file lists
- added -doc package - added -doc package
* Mon Apr 14 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-2qilnx * Mon Apr 14 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-2qilnx
- changed all .bz2 occurences with * - changed all .bz2 occurences with *
* Tue Apr 09 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-1qilnx * Wed Apr 09 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.2.2-1qilnx
- first build for 3.2.2 - first build for 3.2.2