Attachment 832213 Details for Bug 834425 – Git patch for the master branch

[patch] Git patch for the master branch

gprbuild-master-gccversion.patch (text/plain), 3.53 KB, created by Björn Persson on 2013-12-03 16:52:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Persson

Created: 2013-12-03 16:52:35 UTC

Size: 3.53 KB

patch

obsolete

>From 6fcd249b459bb56df2969eb7863f63792420c652 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= <Bjorn@RombobjÃ¶rn.se>
>Date: Tue, 3 Dec 2013 12:37:36 +0100
>Subject: [PATCH] Get the GCC version in a locale-independent way again.
>
>---
> gprbuild-2012-gccversion.patch | 46 ++++++++++++++++++++++++++++++++++++++++++
> gprbuild.spec                  |  8 +++++++-
> 2 files changed, 53 insertions(+), 1 deletion(-)
> create mode 100644 gprbuild-2012-gccversion.patch
>
>diff --git a/gprbuild-2012-gccversion.patch b/gprbuild-2012-gccversion.patch
>new file mode 100644
>index 0000000..e0278b1
>--- /dev/null
>+++ b/gprbuild-2012-gccversion.patch
>@@ -0,0 +1,46 @@
>+--- share/gprconfig/compilers.xml.orig	2012-03-28 15:32:23.000000000 +0200
>++++ share/gprconfig/compilers.xml	2013-12-02 23:05:03.578409505 +0100
>+@@ -12,8 +12,8 @@
>+     <name>GCC</name>
>+     <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-|-elinos-linux|-pc).*)?gcc</executable>
>+     <version>
>+-      <external>${PREFIX}gcc -v</external>
>+-      <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
>++      <external>${PREFIX}gcc -dumpversion</external>
>++      <grep regexp=".*"></grep>
>+     </version>
>+     <languages>C</languages>
>+     <target>
>+@@ -220,8 +220,8 @@
>+     <name>G++</name>
>+     <executable>g\+\+</executable>
>+     <version>
>+-      <external>g++ -v</external>
>+-      <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
>++      <external>g++ -dumpversion</external>
>++      <grep regexp=".*"></grep>
>+     </version>
>+     <languages>C++</languages>
>+     <target>
>+@@ -393,8 +393,8 @@
>+     <name>GCC-ASM</name>
>+     <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-|elinos-linux).*)?gcc</executable>
>+     <version>
>+-      <external>${PREFIX}gcc -v</external>
>+-      <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
>++      <external>${PREFIX}gcc -dumpversion</external>
>++      <grep regexp=".*"></grep>
>+     </version>
>+     <languages>Asm,Asm_Cpp,Asm2</languages>
>+     <target>
>+@@ -418,8 +418,8 @@
>+     </version>
>+     <languages>Ada</languages>
>+     <variable name="gcc_version">
>+-      <external>${PREFIX}gcc -v</external>
>+-      <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
>++      <external>${PREFIX}gcc -dumpversion</external>
>++      <grep regexp=".*"></grep>
>+     </variable>
>+     <runtimes default="default,kernel,native">
>+        <directory group="default" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/</directory>
>diff --git a/gprbuild.spec b/gprbuild.spec
>index 7de6720..cf0652a 100644
>--- a/gprbuild.spec
>+++ b/gprbuild.spec
>@@ -1,6 +1,6 @@
> Name:       gprbuild
> Version:    2012
>-Release:    4%{?dist}
>+Release:    5%{?dist}
> Summary:    Ada project builder
> Group:      Development/Languages
> License:    GPLv2+
>@@ -14,6 +14,8 @@ Patch0:     %{name}-%{version}-style.patch
> Patch1:     %{name}-%{version}-destdir.patch
> ## Fedora specific
> Patch3:     %{name}-%{version}-usrmove.patch
>+## Get the GCC version in a locale-independent way:
>+Patch5:     %{name}-%{version}-gccversion.patch
> Patch6:     %{name}-%{version}-remove_rpath.patch
> 
> BuildRequires:  xmlada-devel
>@@ -46,6 +48,7 @@ Devel package (examples) for gprbuild
> %patch0 -p1 
> %patch1 -p1 
> %patch3 -p1 
>+%patch5
> %patch6 -p1 
> 
> %build
>@@ -77,6 +80,9 @@ mv -f %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
> %{_datadir}/%{name}/examples/*
> 
> %changelog
>+* Tue Dec 03 2013 BjÃ¶rn Persson <bjorn@rombobjÃ¶rn.se> - 2012-5
>+- Get the GCC version in a locale-independent way again.
>+
> * Fri Jan 25 2013   Pavel Zhukov <landgraf@fedoraproject.org> - 2012-4
> - Rebuild with GCC 4.8 
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 834425: 593584 | 593585 | 593586 | 832212 | 832213 | 832214 | 832215