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

[patch] Git patch for the master branch

gprbuild-master-gccversion.patch (text/plain), 3.61 KB, created by Björn Persson on 2013-12-03 17:04:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Persson

Created: 2013-12-03 17:04:10 UTC

Size: 3.61 KB

patch

obsolete

>From 02200e34d3d6045638603a073fa1ea130303f633 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:32:41 +0100
>Subject: [PATCH] Get the GCC version in a locale-independent way again.
>
>---
> gprbuild-2013-gccversion.patch | 46 ++++++++++++++++++++++++++++++++++++++++++
> gprbuild.spec                  |  8 +++++++-
> 2 files changed, 53 insertions(+), 1 deletion(-)
> create mode 100644 gprbuild-2013-gccversion.patch
>
>diff --git a/gprbuild-2013-gccversion.patch b/gprbuild-2013-gccversion.patch
>new file mode 100644
>index 0000000..b170b3f
>--- /dev/null
>+++ b/gprbuild-2013-gccversion.patch
>@@ -0,0 +1,46 @@
>+--- share/gprconfig/compilers.xml.orig	2013-01-09 19:09:30.000000000 +0100
>++++ share/gprconfig/compilers.xml	2013-12-02 22:41:12.726000000 +0100
>+@@ -12,8 +12,8 @@
>+     <name>GCC</name>
>+     <executable prefix="1">(.*(-wrs-|-sysgo|-elf-|-eabi-|-eabispe-|avr-|-elinos-linux|-pc|-xcoff-).*)?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>
>+@@ -244,8 +244,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>
>+@@ -431,8 +431,8 @@
>+     <name>GCC-ASM</name>
>+     <executable prefix="1">(.*(-wrs-|-elf-|-eabi-|-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>
>+@@ -456,8 +456,8 @@
>+     </version>
>+     <languages>Ada</languages>
>+     <variable name="gcc_version">
>+-      <external>${PREFIX}gcc -v</external>
>+-      <grep regexp="^[-\w]*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 b30736f..c82ec27 100644
>--- a/gprbuild.spec
>+++ b/gprbuild.spec
>@@ -1,6 +1,6 @@
> Name:       gprbuild
> Version:    2013
>-Release:    6%{?dist}
>+Release:    7%{?dist}
> Summary:    Ada project builder
> Group:      Development/Languages
> License:    GPLv2+
>@@ -12,6 +12,8 @@ Source0:    %{name}-gpl-%{version}-src.tgz
> 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
>@@ -36,6 +38,7 @@ and libraries and is particularly well-suited for compiled languages.
> %setup -q -n %{name}-%{version}-src
> %patch1 -p1 
> %patch3 -p1 
>+%patch5
> %patch6 -p1 
> 
> %build
>@@ -63,6 +66,9 @@ find __doc/examples -type f -exec chmod -x {} \;
> %_GNAT_project_dir/*
> 
> %changelog
>+* Tue Dec 03 2013 BjÃ¶rn Persson <bjorn@rombobjÃ¶rn.se> - 2013-7
>+- Get the GCC version in a locale-independent way again.
>+
> * Mon Nov 18 2013 Pavel Zhukov <landgraf@fedoraproject.org> - 2013-6
> - Add fedora-gnat-project-common to the requires list
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

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