Attachment 912966 Details for Bug 1106077 – Fix FTBFS on F20, F21

[patch] Fix FTBFS on F20, F21

Fix-FTBFS-on-F20-F21-992081-1106077.patch (text/plain), 3.70 KB, created by Yaakov Selkowitz on 2014-06-27 21:59:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-27 21:59:05 UTC

Size: 3.70 KB

patch

obsolete

>From d7f764701f05a7252746f4bd09df8e3c53a9d2ef Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Fri, 27 Jun 2014 16:55:50 -0500
>Subject: [PATCH] Fix FTBFS on F20, F21 (#992081, #1106077)
>
>Omit default optflags not supported by gcc-3.4
>Exclude AArch64 as it was not supported until gcc 4.8
>Do not conflict with libstdc++ 4.9.x, it is still backwards ABI compatible
>Update bison patch for bison-3.0
>---
> compat-gcc-34.spec | 15 +++++++++++----
> gcc34-bison4.patch | 18 ++++++++++++++++++
> 2 files changed, 29 insertions(+), 4 deletions(-)
>
>diff --git a/compat-gcc-34.spec b/compat-gcc-34.spec
>index 00c812f..df02ead 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: 32%{?dist}
>+Release: 33%{?dist}
> # libgcc and crtstuff have an exception which allows
> # linking it into any kind of programs or shared libraries without
> # restrictions.
>@@ -45,7 +45,7 @@ Conflicts: gdb < 5.1-2
> Requires: glibc-devel >= 2.2.90-12
> Requires: libgcc >= 4.1.0
> BuildRequires: elfutils-devel >= 0.72
>-ExcludeArch: %{arm}
>+ExcludeArch: %{arm} aarch64
> %ifarch %{multilib_64_archs} sparc sparcv9 ppc
> # Ensure glibc{,-devel} is installed for both multilib arches
> BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
>@@ -138,7 +138,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++ < 4.9.0
>+Requires: libstdc++ >= 4.1.0, libstdc++ < 4.10.0
> Obsoletes: compat-egcs-c++
> Obsoletes: compat-gcc-c++
> Obsoletes: compat-libstdc++
>@@ -292,7 +292,8 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=z9-109//g;s/-mtune=z10//g'`
> %endif
> OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Wall//g' -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
> OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fexceptions//g' -e 's/-fasynchronous-unwind-tables//g'`
>-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector//g' -e 's/--param=ssp-buffer-size=[0-9]*//g'`
>+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-fstack-protector[^ ]*//g' -e 's/--param=ssp-buffer-size=[0-9]*//g'`
>+OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Werror[^ ]*//g' -e 's/-grecord-gcc-switches//g'`
> %ifarch sparc64
> cat > gcc64 <<"EOF"
> #!/bin/sh
>@@ -683,6 +684,12 @@ fi
> %{_prefix}/%{_lib}/libg2c.so.0*
> 
> %changelog
>+* Fri Jun 27 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 3.4.6-33
>+- Omit default optflags not supported by gcc-3.4 (#992081, #1106077)
>+- Exclude AArch64 as it was not supported until gcc 4.8
>+- Do not conflict with libstdc++ 4.9.x, it is still backwards ABI compatible
>+- Update bison patch for bison-3.0
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-32
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/gcc34-bison4.patch b/gcc34-bison4.patch
>index f4a388f..2a931a3 100644
>--- a/gcc34-bison4.patch
>+++ b/gcc34-bison4.patch
>@@ -1,5 +1,14 @@
> --- gcc/c-parse.in	2009-02-10 12:41:09.000000000 +0100
> +++ gcc/c-parse.in	2009-02-10 13:23:53.000000000 +0100
>+@@ -635,7 +635,7 @@ primary:
>+ 	IDENTIFIER
>+ 		{
>+ 		  if (yychar == YYEMPTY)
>+-		    yychar = YYLEX;
>++		    yychar = yylex();
>+ 		  $$ = build_external_ref ($1, yychar == '(');
>+ 		}
>+ 	| CONSTANT
> @@ -1647,7 +1647,7 @@ enum_head:
>  
>  structsp_attr:
>@@ -33,3 +42,12 @@
>  	  enumlist maybecomma_warn '}' maybe_attribute
>  		{ $$ = finish_enum ($<ttype>3, nreverse ($4),
>  				    chainon ($1, $7)); }
>+@@ -2227,7 +2227,7 @@ do_stmt_start:
>+ 
>+ save_location:
>+ 		{ if (yychar == YYEMPTY)
>+-		    yychar = YYLEX;
>++		    yychar = yylex();
>+ 		  $$ = input_location; }
>+ 	;
>+ 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1106077: 903813 | 903814 | 903815 | 912966