349bf96160
The upgrade to v10.0.0 included significant changes to the OpenSSL dependency in Node.js, in particular how the build was configured. Upstream does not include a BSD-x86 config anymore, so the www/node port ended up using the BSD-x86_64 no-asm config for all builds except x86_64 (which used the asm optimized config). This was a mistake, causing all 32-bit archs to build OpenSSL configured for a 64-bit architecture, and it causes problems with SSL/TLS as described in PR 228135. Change the build config to not use BSD-x86_64 no-asm for 32-bit i386 and arm builds, falling back to the generic linux-elf configuration instead. Patches remove Linux specific libraries (-ldl) and keep the CFLAGS the same as the BSD config. PR: 228135 Reported by: Marcin Cie\xc5\x9blak <saper@saper.info>
18 lines
603 B
Python
18 lines
603 B
Python
--- deps/openssl/openssl-cl_no_asm.gypi.orig 2018-05-11 10:11:27 UTC
|
|
+++ deps/openssl/openssl-cl_no_asm.gypi
|
|
@@ -1,4 +1,5 @@
|
|
{
|
|
+ 'defines': ['OPENSSL_NO_ASM'],
|
|
'conditions': [
|
|
['target_arch=="ppc" and OS=="aix"', {
|
|
'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'],
|
|
@@ -41,7 +42,7 @@
|
|
'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
|
|
}, {
|
|
# Other architectures don't use assembly
|
|
- 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
|
|
+ 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
|
|
}],
|
|
],
|
|
}
|