Bug 1279151 - Version'ize the result of yasm_version. r=chmanchester, a=lizzard
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 09 Jun 2016 15:27:59 +0900
changeset 339651 1f6baa21d0d04f6accab9be680737ec501597d12
parent 339650 8d0231d59d0f4ecb7ccd25e3795537b816a92c8c
child 339652 6ed3514f726d04fd4481039d10af2694e8994636
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester, lizzard
bugs1279151, 1269513, 0, 19615
milestone49.0a2
Bug 1279151 - Version'ize the result of yasm_version. r=chmanchester, a=lizzard Before bug 1269513, yasm_version returned a Version object, and it doesn't anymore, which made the assignment of _YASM_*_VERSION skipped silently. Then, configure would go through the yasm version checks as if they were false and skipping over the AC_MSG_ERRORs, printing out: /builds/slave/try-m64-0000000000000000000000/build/src/old-configure: line 19615: test: : integer expression expected which is why this went undetected: the version checks were simply ignored. Some shells, however, evaluated the yasm version checks as true, hitting the AC_MSG_ERRORs.
build/moz.configure/toolchain.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -10,17 +10,17 @@ yasm = check_prog('YASM', ['yasm'], allo
 
 @depends_if(yasm)
 @checking('yasm version')
 def yasm_version(yasm):
     version = check_cmd_output(
         yasm, '--version',
         onerror=lambda: die('Failed to get yasm version.')
     ).splitlines()[0].split()[1]
-    return version
+    return Version(version)
 
 # Until we move all the yasm consumers out of old-configure.
 # bug 1257904
 add_old_configure_assignment('_YASM_MAJOR_VERSION',
                              delayed_getattr(yasm_version, 'major'))
 add_old_configure_assignment('_YASM_MINOR_VERSION',
                              delayed_getattr(yasm_version, 'minor'))