build: fix version checks in configure.py

targos · MylesBorins · commit c1fade53260f · 2019-10-23T02:25:55.000-04:00
Fixes: #29927 Refs: #29931 PR-URL: #29965 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/configure.py b/configure.py
@@ -14,6 +14,7 @@
 import bz2
 
 from distutils.spawn import find_executable as which
+from distutils.version import StrictVersion
 
 # If not run from node/, cd to node/.
 os.chdir(os.path.dirname(__file__) or '.')
@@ -1231,10 +1232,10 @@ def without_ssl_error(option):
 # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
 # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
 openssl110_asm_supported = \
- ('gas_version' in variables and float(variables['gas_version']) >= 2.23) or \
- ('xcode_version' in variables and float(variables['xcode_version']) >= 5.0) or \
- ('llvm_version' in variables and float(variables['llvm_version']) >= 3.3) or \
- ('nasm_version' in variables and float(variables['nasm_version']) >= 2.10)
+ ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \
+ ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \
+ ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \
+ ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10'))
 
 if is_x86 and not openssl110_asm_supported:
 error('''Did not find a new enough assembler, install one or build with

-Original file line number
+Diff line change
 importbz2
 fromdistutils.spawnimportfind_executableaswhich
 +fromdistutils.versionimportStrictVersion
 # If not run from node/, cd to node/.
 os.chdir(os.path.dirname(__file__) or'.')
 # supported asm compiler for AVX2. See https://github.com/openssl/openssl/
 # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
 openssl110_asm_supported= \
 - ('gas_version'invariablesandfloat(variables['gas_version']) >=2.23) or \
 - ('xcode_version'invariablesandfloat(variables['xcode_version']) >=5.0) or \
 - ('llvm_version'invariablesandfloat(variables['llvm_version']) >=3.3) or \
 - ('nasm_version'invariablesandfloat(variables['nasm_version']) >=2.10)
 + ('gas_version'invariablesandStrictVersion(variables['gas_version']) >=StrictVersion('2.23')) or \
 + ('xcode_version'invariablesandStrictVersion(variables['xcode_version']) >=StrictVersion('5.0')) or \
 + ('llvm_version'invariablesandStrictVersion(variables['llvm_version']) >=StrictVersion('3.3')) or \
 + ('nasm_version'invariablesandStrictVersion(variables['nasm_version']) >=StrictVersion('2.10'))
 ifis_x86andnotopenssl110_asm_supported:
 error('''Did not find a new enough assembler, install one or build with