[packages/gcc/GCC_6] - added branch diff (needed to build with glibc 2.26+) - updated info patch - adjusted gcov* files
qboosh
qboosh at pld-linux.org
Thu Apr 5 21:04:25 CEST 2018
commit f3ac85761849261c95c1dec6680af37eee4c280d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 5 21:04:16 2018 +0200
- added branch diff (needed to build with glibc 2.26+)
- updated info patch
- adjusted gcov* files
gcc-info.patch | 46 +++++++++--------
gcc.spec | 154 +++++++++++++++++++++++++++++----------------------------
2 files changed, 104 insertions(+), 96 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index bd17e5a..fc453b8 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -139,9 +139,9 @@ 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: 15e56f8d7ba9be17cd5d1595c5b3dde5
+# Patch100-md5: 1d4bc26154e47de7d727d6767215e776
Patch0: %{name}-info.patch
Patch2: %{name}-nodebug.patch
Patch3: %{name}-ada-link.patch
@@ -2986,7 +2986,7 @@ Extensions dla języka C.
%prep
%setup -q
-#%patch100 -p0
+%patch100 -p0
%patch0 -p1
%patch2 -p1
%patch3 -p1
@@ -3603,13 +3603,15 @@ 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
%{_mandir}/man1/cc.1*
%{_mandir}/man1/cpp.1*
%{_mandir}/man1/gcc.1*
%{_mandir}/man1/gcov.1*
+%{_mandir}/man1/gcov-dump.1*
+%{_mandir}/man1/gcov-tool.1*
%{_infodir}/cpp.info*
%{_infodir}/cppinternals.info*
%{_infodir}/gcc.info*
@@ -3929,78 +3931,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)
@@ -4965,3 +4895,75 @@ rm -rf $RPM_BUILD_ROOT
%{gcclibdir}/plugin/include
%attr(755,root,root) %{gcclibdir}/plugin/libcc1plugin.la
%attr(755,root,root) %{gcclibdir}/plugin/libcc1plugin.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 abde4e4..27c65be 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
- at dircategory GNU Ada Tools
+ at 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
+- at dircategory GNU Ada Tools
++ at 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 @@
@@ -278,17 +295,6 @@
@chapter Invoking rebuild-gcj-db
@c man title rebuild-gcj-db Merge the per-solib databases made by aot-compile into one system-wide database.
---- 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
-- at dircategory GNU Ada Tools
-+ at 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/f3ac85761849261c95c1dec6680af37eee4c280d
More information about the pld-cvs-commit
mailing list