External nanomsg fixes

binding.gyp

@@ -19,22 +19,24 @@
         }],
         ['OS=="linux" and use_system_libnanomsg=="true"', {
           'include_dirs+': [
-            '<!@(pkg-config nanomsg --cflags-only-I | sed s/-I//g)/nanomsg  || echo "")',
-            '<!@(pkg-config libnanomsg --cflags | sed s/-I//g || echo "")',
+            '<!@(pkg-config nanomsg --cflags-only-I | sed s/-I//g || echo "")'
           ],
           'libraries': [
-            '<!@(pkg-config nanomsg --libs || echo "")',
-            '<!@(pkg-config libnanomsg --libs || echo "")',
+            '<!@(pkg-config nanomsg --libs || echo "")'
+          ],
+          'defines': [
+            'SYSTEM_NANOMSG=1',
           ],
         }],
         ['OS=="mac" and use_system_libnanomsg=="true"', {
           'include_dirs+': [
-            '<!@(pkg-config libnanomsg --cflags | sed s/-I//g || echo "")',
-            '<!@(pkg-config nanomsg --cflags | sed s/-I//g || echo "")',
+            '<!@(pkg-config nanomsg --cflags | sed s/-I//g || echo "")'
           ],
           'libraries': [
-            '<!@(pkg-config libnanomsg --libs || echo "")',
-            '<!@(pkg-config nanomsg --libs || echo "")',
+            '<!@(pkg-config nanomsg --libs || echo "")'
+          ],
+          'defines': [
+            'SYSTEM_NANOMSG=1',
           ],
         }],
         ['OS=="mac" and asan=="true"', {

package.json

@@ -1,11 +1,11 @@
 {
   "name": "nanomsg",
-  "version": "4.2.1",
+  "version": "4.2.4",
   "description": "Node bindings for nanomsg",
   "main": "lib/index.js",
   "dependencies": {
     "bindings": "^1.5.0",
-    "nan": "^2.15.0"
+    "nan": "^2.18.0"
   },
   "devDependencies": {
     "buffer-alloc": "1.2.0",

src/node_nanomsg.cc

@@ -1,16 +1,35 @@
+#ifndef SYSTEM_NANOMSG
+
 #include "bus.h"
 #include "inproc.h"
 #include "ipc.h"
 #include "nn.h"
 #include "pair.h"
 #include "pipeline.h"
-#include "poll_ctx.h"
 #include "pubsub.h"
 #include "reqrep.h"
 #include "survey.h"
 #include "tcp.h"
 #include "ws.h"
 
+#else
+
+#include "nanomsg/bus.h"
+#include "nanomsg/inproc.h"
+#include "nanomsg/ipc.h"
+#include "nanomsg/nn.h"
+#include "nanomsg/pair.h"
+#include "nanomsg/pipeline.h"
+#include "nanomsg/pubsub.h"
+#include "nanomsg/reqrep.h"
+#include "nanomsg/survey.h"
+#include "nanomsg/tcp.h"
+#include "nanomsg/ws.h"
+
+#endif
+
+#include "poll_ctx.h"
+
 NAN_METHOD(Socket) {
   int domain = Nan::To<int>(info[0]).FromJust();
   int protocol = Nan::To<int>(info[1]).FromJust();

src/poll_ctx.cc

@@ -1,4 +1,8 @@
+#ifndef SYSTEM_NANOMSG
 #include "nn.h"
+#else
+#include "nanomsg/nn.h"
+#endif
 #include "poll_ctx.h"
 
 void PollCtx::on_readable(uv_poll_t* req, int /* status */, int events) {
@@ -37,8 +41,12 @@ v8::Local<v8::Value> PollCtx::WrapPointer (void* ptr, size_t length) {
 PollCtx* PollCtx::UnwrapPointer (v8::Local<v8::Value> buffer) {
    v8::Local<v8::ArrayBufferView> ui = buffer.As<v8::ArrayBufferView>();
    v8::Local<v8::ArrayBuffer> abuf = ui->Buffer();
-   std::shared_ptr<v8::BackingStore> ab_c = abuf->GetBackingStore();
+   void *data = NULL;
+#if (V8_MAJOR_VERSION >= 8)
+   data = static_cast<char*>(abuf->GetBackingStore()->Data());
    abuf->Detach();
-   return reinterpret_cast<PollCtx*>(node::Buffer::HasInstance(buffer) ?
-      static_cast<char*>(ab_c->Data()) : NULL);
+#else
+   data = static_cast<char*>(abuf->GetContents().Data());
+#endif
+   return reinterpret_cast<PollCtx*>(node::Buffer::HasInstance(buffer) ? data : NULL);
 }