From 5e043a6c789560415b34b944bc0d81f7ee630df6 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 20 Sep 2017 11:43:48 +0200
Subject: [PATCH] deps: define BUILDING_NGHTTP2 during nghttp2 build

Define BUILDING_NGHTTP2 in order that NGHTTP2_EXTERN is properly defined
when building the nghttp2 static library.

Move NGHTTP2_STATICLIB out of node.gyp because it is a property of the
nghttp2 static library, not the node executable.

PR-URL: https://github.com/nodejs/node/pull/15487
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 deps/nghttp2/nghttp2.gyp | 6 +++++-
 node.gyp                 | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/deps/nghttp2/nghttp2.gyp b/deps/nghttp2/nghttp2.gyp
index 8e351609290848..8da81485e5f045 100644
--- a/deps/nghttp2/nghttp2.gyp
+++ b/deps/nghttp2/nghttp2.gyp
@@ -9,13 +9,16 @@
       'target_name': 'nghttp2',
       'type': 'static_library',
       'include_dirs': ['lib/includes'],
+      'defines': [
+        'BUILDING_NGHTTP2',
+        'NGHTTP2_STATICLIB',
+      ],
       'conditions': [
         ['OS=="win"', {
           'defines': [
             'WIN32',
             '_WINDOWS',
             'HAVE_CONFIG_H',
-            'NGHTTP2_STATICLIB',
           ],
           'msvs_settings': {
             'VCCLCompilerTool': {
@@ -28,6 +31,7 @@
         }]
       ],
       'direct_dependent_settings': {
+        'defines': [ 'NGHTTP2_STATICLIB' ],
         'include_dirs': [ 'lib/includes' ]
       },
       'sources': [
diff --git a/node.gyp b/node.gyp
index 17f23564147dd1..2e666586ec02e6 100644
--- a/node.gyp
+++ b/node.gyp
@@ -292,8 +292,6 @@
         'NODE_WANT_INTERNALS=1',
         # Warn when using deprecated V8 APIs.
         'V8_DEPRECATION_WARNINGS=1',
-        # We're using the nghttp2 static lib
-        'NGHTTP2_STATICLIB'
       ],
     },
     {