Attachment 593586 Details for Bug 834425 – fix version parsing for non-English locales

[patch] fix version parsing for non-English locales

gprbuild-compilers.patch (text/plain), 1.69 KB, created by Julian Leyh on 2012-06-21 20:36:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Leyh

Created: 2012-06-21 20:36:36 UTC

Size: 1.69 KB

patch

obsolete

>--- gprbuild-2011-src/share/gprconfig/compilers.xml.orig	2011-03-10 20:01:16.000000000 +0100
>+++ gprbuild-2011-src/share/gprconfig/compilers.xml	2012-06-21 22:22:24.765070355 +0200
>@@ -11,8 +11,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>
>@@ -172,8 +172,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>
>@@ -298,8 +298,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>
>@@ -326,8 +326,8 @@
>       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
>     </version>
>     <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>
>     <languages>Ada</languages>
>     <runtimes default="default,kernel">

Actions: View | Diff

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