diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2019-10-11 13:20:16 +0200 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-10-13 16:20:22 -0700 |
| commit | 6f814013f45698a9178203331b62e3fe07fdb7d5 (patch) | |
| tree | ef9203f3a1a1e28cc74dbce144136082c176a96c /deps/openssl/openssl.gyp | |
| parent | 545f7282d126ee43cf9cfeb66c83d0cbd2c60614 (diff) | |
| download | android-node-v8-6f814013f45698a9178203331b62e3fe07fdb7d5.tar.gz android-node-v8-6f814013f45698a9178203331b62e3fe07fdb7d5.tar.bz2 android-node-v8-6f814013f45698a9178203331b62e3fe07fdb7d5.zip | |
build: fix version checks in gyp files
Make `distutils.version.StrictVersion` available as a helper to
gyp expressions so they can do proper version checks and update
the gyp files accordingly.
Caveat emptor: `StrictVersion` does *not* like empty strings so
this commit adds truthiness guards. The helper could deal with
those but I felt it better to make it explicit.
Fixes: https://github.com/nodejs/node/issues/29927
PR-URL: https://github.com/nodejs/node/pull/29931
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/openssl/openssl.gyp')
| -rw-r--r-- | deps/openssl/openssl.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 0ca7515611..4609d83baa 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -21,7 +21,8 @@ }, 'target_arch=="arm64" and OS=="win"', { # VC-WIN64-ARM inherits from VC-noCE-common that has no asms. 'includes': ['./openssl_no_asm.gypi'], - }, 'gas_version >= "2.26" or nasm_version >= "2.11.8"', { + }, 'gas_version and v(gas_version) >= v("2.26") or ' + 'nasm_version and v(nasm_version) >= v("2.11.8")', { # Require AVX512IFMA supported. See # https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_ia32cap.html # Currently crypto/poly1305/asm/poly1305-x86_64.pl requires AVX512IFMA. |