From fa905ea07df7229ded71691e85f8fa4d504b7180 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 6 Jun 2017 14:16:34 -0500
Subject: Add serialport back into the build.

---
 recipes-devtools/node-red/files/errnopatch.txt | 14 ++++++++++++++
 recipes-devtools/node-red/node-red_0.11.1.bb   |  9 ++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 recipes-devtools/node-red/files/errnopatch.txt

(limited to 'recipes-devtools')

diff --git a/recipes-devtools/node-red/files/errnopatch.txt b/recipes-devtools/node-red/files/errnopatch.txt
new file mode 100644
index 0000000..39e2a7c
--- /dev/null
+++ b/recipes-devtools/node-red/files/errnopatch.txt
@@ -0,0 +1,14 @@
+diff -Naru old/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp new/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp
+--- old/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp	2015-05-09 10:20:06.000000000 -0500
++++ new/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp	2017-06-06 13:19:56.156266989 -0500
+@@ -35,8 +35,8 @@
+     #ifdef UV_ERRNO_H_
+     const char* err_string = uv_strerror(status);
+     #else
+-    uv_err_t errno = uv_last_error(uv_default_loop());
+-    const char* err_string = uv_strerror(errno);
++    uv_err_t err = uv_last_error(uv_default_loop());
++    const char* err_string = uv_strerror(err);
+     #endif
+     snprintf(this->errorString, sizeof(this->errorString), "Error %s on polling", err_string);
+     argv[0] = v8::Exception::Error(NanNew<v8::String>(this->errorString));
diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index 1dba51a..0eb3ab6 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -4,6 +4,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 DEPENDS = "nodejs nodejs-native"
 PR = "r0"
+FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
+SRC_URI += "file://errnopatch.txt"
 
 inherit npm-base
 
@@ -15,10 +17,11 @@ do_install() {
     # npm install locally
     oe_runnpm install --prefix ./ node-red@0.11.1
 
+    # Patch for 6.2 compiler and errno overload issue
+    patch -N -p1 <errnopatch.txt
+
     # npm install more stuff
-    # serialport dropped because of compiler error (g++ 6.2) in morty:
-    #
-    oe_runnpm install --prefix ./node_modules/node-red nodemailer
+    oe_runnpm install --prefix ./node_modules/node-red nodemailer serialport
 
     # modules needed for loragw
     oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants
-- 
cgit v1.2.3