2 files changed, 29 insertions, 0 deletions
diff --git a/editors/atom/files/node/patch-common.gypi b/editors/atom/files/node/patch-common.gypi
new file mode 100644
index 000000000000..becb72fa3fc4
--- /dev/null
+++ b/editors/atom/files/node/patch-common.gypi
@@ -0,0 +1,18 @@
+--- common.gypi.orig	2020-04-12 11:55:35 UTC
++++ common.gypi
+@@ -509,15 +509,6 @@
+         'libraries': [ '-lelf' ],
+       }],
+       ['OS=="freebsd"', {
+-        'conditions': [
+-          ['"0" < llvm_version < "4.0"', {
+-            # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial.
+-            # Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later.
+-            # Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html
+-            # Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup
+-            'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ],
+-          }],
+-        ],
+         'ldflags': [
+           '-Wl,--export-dynamic',
+         ],
diff --git a/editors/atom/files/node/patch-configure.py b/editors/atom/files/node/patch-configure.py
new file mode 100644
index 000000000000..f069527a7b00
--- /dev/null
+++ b/editors/atom/files/node/patch-configure.py
@@ -0,0 +1,11 @@
+--- configure.py.orig	2020-06-16 06:19:09 UTC
++++ configure.py
+@@ -705,7 +705,7 @@ def get_nasm_version(asm):
+ 
+ def get_llvm_version(cc):
+   return get_version_helper(
+-    cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)")
++    cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)")
+ 
+ def get_xcode_version(cc):
+   return get_version_helper(