Attachment 1362079 Details for Bug 1423303 – Fixes build on Fedora 26

[patch] Fixes build on Fedora 26

0001-Fix-build-on-F26.patch (text/plain), 3.69 KB, created by Rafal Luzynski on 2017-12-02 19:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rafal Luzynski

Created: 2017-12-02 19:40:05 UTC

Size: 3.69 KB

patch

obsolete

>From 2555dd67185fcb2c30911f3b1f119415e3f04011 Mon Sep 17 00:00:00 2001
>From: Rafal Luzynski <digitalfreak@lingonborough.com>
>Date: Sat, 2 Dec 2017 00:04:56 +0100
>Subject: [PATCH] Fix build on F26 and newer
>
>Add a patch to fix build of gcc.texi, original upstream commit
>by Uros Bizjak.  Fixes rhbz#1423303.
>
>Bump the maximum version of libstdc++.  Fixes rhbz#1514870.
>---
> compat-gcc-34.spec    | 12 ++++++++++--
> gcc34-rh1423303.patch | 35 +++++++++++++++++++++++++++++++++++
> 2 files changed, 45 insertions(+), 2 deletions(-)
> create mode 100644 gcc34-rh1423303.patch
>
>diff --git a/compat-gcc-34.spec b/compat-gcc-34.spec
>index e5171a1..f327a36 100644
>--- a/compat-gcc-34.spec
>+++ b/compat-gcc-34.spec
>@@ -16,7 +16,7 @@
> Summary: Compatibility GNU Compiler Collection
> Name: compat-gcc-34
> Version: 3.4.6
>-Release: 42%{?dist}
>+Release: 43%{?dist}
> # libgcc and crtstuff have an exception which allows
> # linking it into any kind of programs or shared libraries without
> # restrictions.
>@@ -121,6 +121,7 @@ Patch101: gcc34-makeinfo.patch
> Patch102: gcc34-bison4.patch
> Patch103: gcc34-pr56258.patch
> Patch104: gcc34-bison.patch
>+Patch105: gcc34-rh1423303.patch
> 
> %define _gnu %{nil}
> %ifarch sparc sparcv9
>@@ -140,7 +141,7 @@ This package includes a GCC 3.4.6-RH compatibility compiler.
> Summary: C++ support for compatibility compiler
> Group: Development/Languages
> Requires: compat-gcc-34 = %{version}-%{release}
>-Requires: libstdc++ >= 4.1.0, libstdc++ < 7.0.0
>+Requires: libstdc++ >= 4.1.0, libstdc++ < 8.0.0
> Obsoletes: compat-egcs-c++
> Obsoletes: compat-gcc-c++
> Obsoletes: compat-libstdc++
>@@ -242,6 +243,7 @@ Fortran 77 dynamically linked programs.
> %patch102 -p0 -b .bison4~
> %patch103 -p0 -b .pr56258~
> %patch104 -p0 -b .bison~
>+%patch105 -p0 -b .rh1423303~
> 
> sed -i -e 's/struct siginfo/siginfo_t/' gcc/config/*/linux*.h
> 
>@@ -689,6 +691,12 @@ fi
> %{_prefix}/%{_lib}/libg2c.so.0*
> 
> %changelog
>+* Fri Dec 01 2017 Rafal Luzynski  <digitalfreak@lingonborough.com> - 3.4.6-43
>+- add a patch to fix build of the info docs, originally written by Uros Bizjak,
>+  fixes #1423303
>+- don't conflict with libstdc++ 7.x, it is still backwards ABI compatible,
>+  fixes #1514870
>+
> * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.6-42
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
> 
>diff --git a/gcc34-rh1423303.patch b/gcc34-rh1423303.patch
>new file mode 100644
>index 0000000..c056c0b
>--- /dev/null
>+++ b/gcc34-rh1423303.patch
>@@ -0,0 +1,35 @@
>+From 779c39ce4b494704375e166ee7ab082243986463 Mon Sep 17 00:00:00 2001
>+From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
>+Date: Tue, 1 Oct 2013 15:02:22 +0000
>+Subject: [PATCH] 	* doc/install.texi (Host/target specific installation
>+ notes for GCC): 	Put @anchor before @heading. 	* doc/gcc.texi
>+ (titlepage): Use @uref and http:// prefix for website. 	Use @email for
>+ email addresses.
>+
>+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203065 138bc75d-0d04-0410-961f-82ee72b054a4
>+---
>+ gcc/doc/gcc.texi | 6 +++---
>+ 1 file changed, 3 insertions(+), 3 deletions(-)
>+
>+diff --git gcc/doc/gcc.texi.jj gcc/doc/gcc.texi
>+index 02b81cf86ec..55307cd35ee 100644
>+--- gcc/doc/gcc.texi.jj
>++++ gcc/doc/gcc.texi
>+@@ -90,11 +90,11 @@ This file documents the use of the GNU compilers.
>+ Published by:
>+ @multitable @columnfractions 0.5 0.5
>+ @item GNU Press
>+-@tab Website: www.gnupress.org
>++@tab Website: @uref{http://www.gnupress.org}
>+ @item a division of the
>+-@tab General: @tex press@@gnu.org @end tex
>++@tab General: @email{press@@gnu.org}
>+ @item Free Software Foundation
>+-@tab Orders:  @tex sales@@gnu.org @end tex
>++@tab Orders:  @email{sales@@gnu.org}
>+ @item 59 Temple Place Suite 330
>+ @tab Tel 617-542-5942
>+ @item Boston, MA 02111-1307 USA
>+-- 
>+2.13.6
>+
>-- 
>2.7.5
>

Actions: View | Diff

Attachments on bug 1423303: 1251660 | 1251661 | 1251662 | 1362079 | 1362080 | 1362081