From: Evan Torrie <evan.torrie@yahoo.com>
Date: Tue, 9 Dec 2014 19:02:39 +0000 (-0800)
Subject: build: fix build with systemtap providers enabled
X-Git-Tag: v1.0.0~196
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=691d55fecaa5b15a5df25a4b9950585f82fade51;p=platform%2Fupstream%2Fnodejs.git

build: fix build with systemtap providers enabled

The "dtrace" script version include in systemtap-sdt-devel-2.6-3
(part of Fedora 21) no longer ignores unknown command line
arguments, but will instead error out and refuse to run.
This patch adds a separate condition to node's gyp input so
that on Linux it will run dtrace without the -xnolibs
argument that trips it up on systemtap-std-devel-2.6-3.

PR-URL: https://github.com/joyent/node/pull/8846
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---

diff --git a/node.gyp b/node.gyp
index 77265c5..42a1430 100644
--- a/node.gyp
+++ b/node.gyp
@@ -466,7 +466,7 @@
       'target_name': 'node_dtrace_header',
       'type': 'none',
       'conditions': [
-        [ 'node_use_dtrace=="true"', {
+        [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
           'actions': [
             {
               'action_name': 'node_dtrace_header',
@@ -476,7 +476,18 @@
                 '-o', '<@(_outputs)' ]
             }
           ]
-        } ]
+        } ],
+        [ 'node_use_dtrace=="true" and OS=="linux"', {
+          'actions': [
+            {
+              'action_name': 'node_dtrace_header',
+              'inputs': [ 'src/node_provider.d' ],
+              'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_provider.h' ],
+              'action': [ 'dtrace', '-h', '-s', '<@(_inputs)',
+                '-o', '<@(_outputs)' ]
+            }
+          ]
+        } ],
       ]
     },
     {