File 0001-chromium-build-gcc5.patch of Package libchromiumcontent

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-chromium-build-gcc5.patch of Package libchromiumcontent (Revision 4b633baced81ed13ecc10c9c23787534)

Currently displaying revision 4b633baced81ed13ecc10c9c23787534 , Show latest

Index: b/build/compiler_version.py
===================================================================
--- a/build/compiler_version.py
+++ b/build/compiler_version.py
@@ -56,7 +56,7 @@ def GetVersion(compiler, tool):
     if tool == "compiler":
       compiler = compiler + " -dumpversion"
       # 4.6
-      version_re = re.compile(r"(\d+)\.(\d+)")
+      version_re = re.compile(r"(\d+)")
     elif tool == "assembler":
       compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
       # Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@ def GetVersion(compiler, tool):
       raise subprocess.CalledProcessError(pipe.returncode, compiler)
 
     parsed_output = version_re.match(tool_output)
-    result = parsed_output.group(1) + parsed_output.group(2)
+    if tool == "compiler":
+      result = parsed_output.group(1) + "1"
+    else:
+      result = parsed_output.group(1) + parsed_output.group(2)
+
     compiler_version_cache[cache_key] = result
     return result
   except Exception, e:
Index: b/native_client/build/compiler_version.py
===================================================================
--- a/native_client/build/compiler_version.py
+++ b/native_client/build/compiler_version.py
@@ -56,7 +56,7 @@ def GetVersion(compiler, tool):
     if tool == "compiler":
       compiler = compiler + " -dumpversion"
       # 4.6
-      version_re = re.compile(r"(\d+)\.(\d+)")
+      version_re = re.compile(r"(\d+)")
     elif tool == "assembler":
       compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
       # Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@ def GetVersion(compiler, tool):
       raise subprocess.CalledProcessError(pipe.returncode, compiler)
 
     parsed_output = version_re.match(tool_output)
-    result = parsed_output.group(1) + parsed_output.group(2)
+    if tool == "compiler":
+      result = parsed_output.group(1) + "1"
+    else:    
+      result = parsed_output.group(1) + parsed_output.group(2)
+
     compiler_version_cache[cache_key] = result
     return result
   except Exception, e:

Places

File 0001-chromium-build-gcc5.patch of Package libchromiumcontent (Revision 4b633baced81ed13ecc10c9c23787534)

Places