www/node: fix build on i386

Add patch files missing from r469781, which ensure that the Node.js
build on i386 falls back to the linux-elf OpenSSL config.

PR:		228135
Reported by:	Marcin Cieslak <saper@saper.info>

6 files changed, 80 insertions, 0 deletions

diff --git a/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi b/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi
new file mode 100644
index 000000000000..bf8e0f4a0d58
--- /dev/null
+++ b/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi
@@ -0,0 +1,15 @@
+--- deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi.orig	2018-05-11 12:05:05 UTC
++++ deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi
+@@ -26,10 +26,10 @@
+       'POLY1305_ASM',
+     ],
+     'openssl_cflags_linux-elf': [
+-      '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer',
++      '-Wall -O3 -pthread -DL_ENDIAN',
+     ],
+     'openssl_ex_libs_linux-elf': [
+-      '-ldl -pthread',
++      '',
+     ],
+     'openssl_cli_srcs_linux-elf': [
+       'openssl/apps/app_rand.c',
diff --git a/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi b/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi
new file mode 100644
index 000000000000..a8818f21ef37
--- /dev/null
+++ b/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi
@@ -0,0 +1,15 @@
+--- deps/openssl/config/archs/linux-elf/asm/openssl.gypi.orig	2018-05-11 12:05:18 UTC
++++ deps/openssl/config/archs/linux-elf/asm/openssl.gypi
+@@ -681,10 +681,10 @@
+       'POLY1305_ASM',
+     ],
+     'openssl_cflags_linux-elf': [
+-      '-Wall -O3 -pthread -DL_ENDIAN -fomit-frame-pointer',
++      '-Wall -O3 -pthread -DL_ENDIAN',
+     ],
+     'openssl_ex_libs_linux-elf': [
+-      '-ldl -pthread',
++      '',
+     ],
+   },
+   'include_dirs': [
diff --git a/www/node/files/patch-deps_openssl_config_bn__conf__asm.h b/www/node/files/patch-deps_openssl_config_bn__conf__asm.h
new file mode 100644
index 000000000000..0d2a636e2676
--- /dev/null
+++ b/www/node/files/patch-deps_openssl_config_bn__conf__asm.h
@@ -0,0 +1,13 @@
+--- deps/openssl/config/bn_conf_asm.h.orig	2018-05-11 12:01:43 UTC
++++ deps/openssl/config/bn_conf_asm.h
+@@ -21,8 +21,8 @@
+ # include "./archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h"
+ #elif defined(_WIN32) && defined(_M_X64)
+ # include "./archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h"
+-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
+-# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h"
++//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
++//# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h"
+ #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+ # include "./archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h"
+ #elif defined(__sun) && defined(__i386__)
diff --git a/www/node/files/patch-deps_openssl_config_dso__conf__asm.h b/www/node/files/patch-deps_openssl_config_dso__conf__asm.h
new file mode 100644
index 000000000000..d5d0e9d9b4ea
--- /dev/null
+++ b/www/node/files/patch-deps_openssl_config_dso__conf__asm.h
@@ -0,0 +1,13 @@
+--- deps/openssl/config/dso_conf_asm.h.orig	2018-05-11 12:02:07 UTC
++++ deps/openssl/config/dso_conf_asm.h
+@@ -21,8 +21,8 @@
+ # include "./archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h"
+ #elif defined(_WIN32) && defined(_M_X64)
+ # include "./archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h"
+-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
+-# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h"
++//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
++//# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h"
+ #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+ # include "./archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h"
+ #elif defined(__sun) && defined(__i386__)
diff --git a/www/node/files/patch-deps_openssl_config_opensslconf__asm.h b/www/node/files/patch-deps_openssl_config_opensslconf__asm.h
new file mode 100644
index 000000000000..814bd24dc300
--- /dev/null
+++ b/www/node/files/patch-deps_openssl_config_opensslconf__asm.h
@@ -0,0 +1,13 @@
+--- deps/openssl/config/opensslconf_asm.h.orig	2018-05-11 11:27:00 UTC
++++ deps/openssl/config/opensslconf_asm.h
+@@ -108,8 +108,8 @@
+ # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h"
+ #elif defined(_WIN32) && defined(_M_X64)
+ # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h"
+-#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
+-# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h"
++//#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
++//# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h"
+ #elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)
+ # include "./archs/BSD-x86_64/asm/include/openssl/opensslconf.h"
+ #elif defined(__sun) && defined(__i386__)
diff --git a/www/node/files/patch-deps_openssl_openssl__no__asm.gypi b/www/node/files/patch-deps_openssl_openssl__no__asm.gypi
new file mode 100644
index 000000000000..e5410e9771a5
--- /dev/null
+++ b/www/node/files/patch-deps_openssl_openssl__no__asm.gypi
@@ -0,0 +1,11 @@
+--- deps/openssl/openssl_no_asm.gypi.orig	2018-05-11 12:27:27 UTC
++++ deps/openssl/openssl_no_asm.gypi
+@@ -42,7 +42,7 @@
+       'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
+     }, {
+       # Other architectures don't use assembly
+-      'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
++      'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
+     }],
+   ],
+ }