commit 5c4bbb52f63f794d9e18b16f2f8e43c952f15c2e
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 26 05:23:33 2018 +0200
- merged updates from GCC_6 branch
gcc-info.patch | 46 ++++++++-------
gcc.spec | 174 +++++++++++++++++++++++++++++++--------------------------
2 files changed, 121 insertions(+), 99 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index 332c668..3d5da80 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -4,8 +4,6 @@
# - when adding new subpackages with external libraries (like libffi)
# or having own Version, do not use epoch 6 there, reset them to 0!
#
-# TODO:
-# - revise obsoletes for new libmpx packages!
#
# Conditional build:
# - languages:
@@ -23,6 +21,7 @@
%bcond_without python # build without libstdc++ printers for gdb
%bcond_with gcc_libffi # packaging gcc libffi for system usage
# - other:
+%bcond_without apidocs # do not package API docs
%bcond_without bootstrap # omit 3-stage bootstrap
%bcond_with tests # torture gcc
%bcond_with symvers # enable versioned symbols in libstdc++
(WARNING: changes soname from .so.6 to so.7)
@@ -115,7 +114,7 @@ Source1: %{name}-optimize-la.pl
# check libffi version with libffi/configure.ac
Source3: libffi.pc.in
Source4: branch.sh
-# use branch.sh to update glibc-branch.diff
+# use branch.sh to update gcc-branch.diff
Patch100: %{name}-branch.diff
# Patch100-md5: 389fef34774afd4faa62f5e51d95c122
Patch0: %{name}-info.patch
@@ -181,7 +180,9 @@ BuildRequires: python-devel
BuildRequires: rpm-pythonprov
%endif
BuildRequires: rpmbuild(macros) >= 1.211
+BuildRequires: tar >= 1:1.22
BuildRequires: texinfo >= 4.7
+BuildRequires: xz
BuildRequires: zlib-devel
BuildConflicts: pdksh < 5.2.14-50
Requires: binutils >= 3:2.23
@@ -1077,6 +1078,21 @@ libstdc++ types/containers.
Ten pakiet zawiera skrypty Pythona dla GDB służące do ładnego
wypisywania typów i kontenerów libstdc++.
+%package -n libstdc++-apidocs
+Summary: C++ standard library API documentation
+Summary(pl.UTF-8): Dokumentacja API biblioteki standardowej C++
+License: FDL v1.3 (mainly), GPL v3+ (doxygen generated parts)
+Group: Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description -n libstdc++-apidocs
+API and internal documentation for C++ standard library.
+
+%description -n libstdc++-apidocs -l pl.UTF-8
+Dokumentacja API i wewnętrzna biblioteki standardowej C++.
+
%package fortran
Summary: Fortran 95 language support for GCC
Summary(es.UTF-8): Soporte de Fortran 95 para GCC
@@ -2699,7 +2715,6 @@ Epoch: 0
License: BSD
Group: Libraries
Requires: libstdc++-multilib-32 = %{version}-%{release}
-Obsoletes: libmpx-multilib
%description -n libmpx-multilib-32
This package contains the Memory Protection Extensions C language
@@ -2718,7 +2733,6 @@ License: BSD
Group: Development/Libraries
Requires: libmpx-devel = %{version}-%{release}
Requires: libmpx-multilib-32 = %{version}-%{release}
-Obsoletes: libmpx-multilib-devel
%description -n libmpx-multilib-32-devel
This package contains development files for Memory Protection
@@ -2735,7 +2749,6 @@ Epoch: 0
License: BSD
Group: Development/Libraries
Requires: libmpx-multilib-32-devel = %{version}-%{release}
-Obsoletes: libmpx-multilib-static
%description -n libmpx-multilib-32-static
This package contains the Memory Protection Extensions C language
@@ -3341,7 +3354,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gcc-ar
%attr(755,root,root) %{_bindir}/gcc-nm
%attr(755,root,root) %{_bindir}/gcc-ranlib
-#%attr(755,root,root) %{_bindir}/gccbug
%attr(755,root,root) %{_bindir}/gcov
%attr(755,root,root) %{_bindir}/gcov-dump
%attr(755,root,root) %{_bindir}/gcov-tool
@@ -3675,78 +3687,6 @@ rm -rf $RPM_BUILD_ROOT
%endif
%endif
-# see libmpx/configure.tgt for supported architectures
-%ifarch %{x8664} %{ix86}
-%files -n libmpx
-%defattr(644,root,root,755)
-%doc libmpx/ChangeLog
-%attr(755,root,root) %{_libdir}/libmpx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmpx.so.2
-%attr(755,root,root) %{_libdir}/libmpxwrappers.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmpxwrappers.so.2
-
-%files -n libmpx-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmpx.so
-%attr(755,root,root) %{_libdir}/libmpxwrappers.so
-%{_libdir}/libmpx.la
-%{_libdir}/libmpxwrappers.la
-%{_libdir}/libmpx.spec
-
-%files -n libmpx-static
-%defattr(644,root,root,755)
-%{_libdir}/libmpx.a
-%{_libdir}/libmpxwrappers.a
-%endif
-
-%if %{with multilib}
-%files -n libmpx-multilib-32
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir32}/libmpx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir32}/libmpx.so.2
-%attr(755,root,root) %{_libdir32}/libmpxwrappers.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir32}/libmpxwrappers.so.2
-
-%files -n libmpx-multilib-32-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir32}/libmpx.so
-%attr(755,root,root) %{_libdir32}/libmpxwrappers.so
-%{_libdir32}/libmpx.la
-%{_libdir32}/libmpxwrappers.la
-%{_libdir32}/libmpx.spec
-
-%files -n libmpx-multilib-32-static
-%defattr(644,root,root,755)
-%{_libdir32}/libmpx.a
-%{_libdir32}/libmpxwrappers.a
-%endif
-
-%if %{with multilib2}
-# see libmpx/configure.tgt for supported architectures;
-# no x32 there as of gcc 6.x
-%if "%{multilib2}" != "x32"
-%files -n libmpx-multilib-%{multilib2}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdirm2}/libmpx.so.*.*.*
-%attr(755,root,root) %ghost %{_libdirm2}/libmpx.so.2
-%attr(755,root,root) %{_libdirm2}/libmpxwrappers.so.*.*.*
-%attr(755,root,root) %ghost %{_libdirm2}/libmpxwrappers.so.2
-
-%files -n libmpx-multilib-%{multilib2}-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdirm2}/libmpx.so
-%attr(755,root,root) %{_libdirm2}/libmpxwrappers.so
-%{_libdirm2}/libmpx.la
-%{_libdirm2}/libmpxwrappers.la
-%{_libdirm2}/libmpx.spec
-
-%files -n libmpx-multilib-%{multilib2}-static
-%defattr(644,root,root,755)
-%{_libdirm2}/libmpx.a
-%{_libdirm2}/libmpxwrappers.a
-%endif
-%endif
-
%if %{with ada}
%files ada
%defattr(644,root,root,755)
@@ -3942,6 +3882,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%endif
+%if %{with apidocs}
+%files -n libstdc++-apidocs
+%defattr(644,root,root,755)
+%doc libstdc++-v3/doc/html/*
+%endif
%endif
%if %{with fortran}
@@ -4562,3 +4507,74 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{gcclibdir}/plugin/libcc1plugin.so
%attr(755,root,root) %{gcclibdir}/plugin/libcp1plugin.la
%attr(755,root,root) %{gcclibdir}/plugin/libcp1plugin.so
+# see libmpx/configure.tgt for supported architectures
+%ifarch %{x8664} %{ix86}
+%files -n libmpx
+%defattr(644,root,root,755)
+%doc libmpx/ChangeLog
+%attr(755,root,root) %{_libdir}/libmpx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpx.so.2
+%attr(755,root,root) %{_libdir}/libmpxwrappers.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpxwrappers.so.2
+
+%files -n libmpx-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmpx.so
+%attr(755,root,root) %{_libdir}/libmpxwrappers.so
+%{_libdir}/libmpx.la
+%{_libdir}/libmpxwrappers.la
+%{_libdir}/libmpx.spec
+
+%files -n libmpx-static
+%defattr(644,root,root,755)
+%{_libdir}/libmpx.a
+%{_libdir}/libmpxwrappers.a
+%endif
+
+%if %{with multilib}
+%files -n libmpx-multilib-32
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir32}/libmpx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir32}/libmpx.so.2
+%attr(755,root,root) %{_libdir32}/libmpxwrappers.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir32}/libmpxwrappers.so.2
+
+%files -n libmpx-multilib-32-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir32}/libmpx.so
+%attr(755,root,root) %{_libdir32}/libmpxwrappers.so
+%{_libdir32}/libmpx.la
+%{_libdir32}/libmpxwrappers.la
+%{_libdir32}/libmpx.spec
+
+%files -n libmpx-multilib-32-static
+%defattr(644,root,root,755)
+%{_libdir32}/libmpx.a
+%{_libdir32}/libmpxwrappers.a
+%endif
+
+%if %{with multilib2}
+# see libmpx/configure.tgt for supported architectures;
+# no x32 there as of gcc 6.x
+%if "%{multilib2}" != "x32"
+%files -n libmpx-multilib-%{multilib2}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdirm2}/libmpx.so.*.*.*
+%attr(755,root,root) %ghost %{_libdirm2}/libmpx.so.2
+%attr(755,root,root) %{_libdirm2}/libmpxwrappers.so.*.*.*
+%attr(755,root,root) %ghost %{_libdirm2}/libmpxwrappers.so.2
+
+%files -n libmpx-multilib-%{multilib2}-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdirm2}/libmpx.so
+%attr(755,root,root) %{_libdirm2}/libmpxwrappers.so
+%{_libdirm2}/libmpx.la
+%{_libdirm2}/libmpxwrappers.la
+%{_libdirm2}/libmpx.spec
+
+%files -n libmpx-multilib-%{multilib2}-static
+%defattr(644,root,root,755)
+%{_libdirm2}/libmpx.a
+%{_libdirm2}/libmpxwrappers.a
+%endif
+%endif
diff --git a/gcc-info.patch b/gcc-info.patch
index ff0f985..1536e1c 100644
--- a/gcc-info.patch
+++ b/gcc-info.patch
@@ -40,11 +40,11 @@
-* gcov: (gcc) Gcov. @command{gcov}---a test coverage program.
-* gcov-tool: (gcc) Gcov-tool. @command{gcov-tool}---an offline gcda profile
processing program.
-* gcov-dump: (gcc) Gcov-dump. @command{gcov-dump}---an offline gcda and gcno
profile dump tool.
-+* gcc: (gcc). The GNU Compiler Collection.
-+* g++: (gcc). The GNU C++ compiler.
-+* gcov: (gcc) Gcov. @command{gcov}---a test coverage
program.
-+* gcov-tool: (gcc) Gcov-tool. @command{gcov-tool}---an offline gcda
profile processing program.
-+* gcov-dump: (gcc) Gcov-dump. @command{gcov-dump}---an offline gcda
and gcno profile dump tool.
++* gcc: (gcc). The GNU Compiler Collection
++* g++: (gcc). The GNU C++ compiler
++* gcov: (gcc) Gcov. @command{gcov}---a test coverage program
++* gcov-tool: (gcc) Gcov-tool. @command{gcov-tool}---an offline gcda
profile processing program
++* gcov-dump: (gcc) Gcov-dump. @command{gcov-dump}---an offline gcda
and gcno profile dump tool
@end direntry
This file documents the use of the GNU compilers.
@sp 1
@@ -76,17 +76,34 @@
@end direntry
@macro syntax{element}
---- a/gcc/ada/gnat_ugn.texi 2005-12-06 23:45:52.983574000 +0100
-+++ b/gcc/ada/gnat_ugn.texi 2005-12-11 02:35:45.580878360 +0100
-@@ -10,7 +10,7 @@
+--- gcc-6.4.0/gcc/ada/gnat_rm.texi.orig 2016-01-04 14:03:35.362396000
+0100
++++ gcc-6.4.0/gcc/ada/gnat_rm.texi 2018-04-04 20:06:55.773027894 +0200
+@@ -10,9 +10,9 @@
@paragraphindent 0
@exampleindent 4
@finalout
-@dircategory GNU Ada Tools
+@dircategory Programming Languages:
@direntry
- * gnat_ugn: (gnat_ugn.info). gnat_ugn
+-* gnat_rm: (gnat_rm.info). gnat_rm
++* gnat_rm: (gnat_rm.info). gnat_rm
@end direntry
+
+ @definfoenclose strong,`,'
+--- gcc-6.4.0/gcc/ada/gnat_ugn.texi.orig 2018-04-04 16:44:59.699832904
+0200
++++ gcc-6.4.0/gcc/ada/gnat_ugn.texi 2018-04-04 20:07:10.206361061 +0200
+@@ -10,9 +10,9 @@
+ @paragraphindent 0
+ @exampleindent 4
+ @finalout
+-@dircategory GNU Ada Tools
++@dircategory Programming Languages:
+ @direntry
+-* gnat_ugn: (gnat_ugn.info). gnat_ugn
++* gnat_ugn: (gnat_ugn.info). gnat_ugn
+ @end direntry
+
+ @definfoenclose strong,`,'
--- a/gcc/fortran/gfortran.texi 2004-09-16 15:13:39.000000000 +0200
+++ b/gcc/fortran/gfortran.texi 2004-09-26 11:05:50.258074024 +0200
@@ -62,9 +62,9 @@
@@ -101,17 +118,6 @@
@end direntry
This file documents the use and the internals of
the GNU Fortran compiler, (@command{gfortran}).
---- a/gcc/ada/gnat_rm.texi 2005-11-30 12:12:06.000000000 +0100
-+++ b/gcc/ada/gnat_rm.texi 2005-12-11 02:36:14.863426736 +0100
-@@ -26,7 +26,7 @@
- @paragraphindent 0
- @exampleindent 4
- @finalout
--@dircategory GNU Ada Tools
-+@dircategory Programming Languages:
- @direntry
- * gnat_rm: (gnat_rm.info). gnat_rm
- @end direntry
--- a/gcc/doc/install.texi 2005-11-30 12:02:42.000000000 +0100
+++ b/gcc/doc/install.texi 2005-12-11 02:44:22.598279768 +0100
@@ -87,9 +87,9 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gcc.git/commitdiff/5c4bbb52f63f794d9e18b16f2f8e43c952f15c2e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
