Created
June 20, 2012 20:36
-
-
Save ry/e7a1774248ac9f74fc34 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c10e412c8a2170d2a66c062279daf56e8ea3e052 Mon Sep 17 00:00:00 2001 | |
From: Ryan Dahl <ry@tinyclouds.org> | |
Date: Wed, 20 Jun 2012 13:31:49 -0700 | |
Subject: [PATCH] Rename GYP variable node_use_system_openssl to be consistent | |
--- | |
configure | 4 ++-- | |
doc/api/process.markdown | 2 +- | |
node.gyp | 4 ++-- | |
3 files changed, 5 insertions(+), 5 deletions(-) | |
diff --git a/configure b/configure | |
index 2a31576..0f45536 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -340,7 +340,7 @@ def configure_openssl(o): | |
o['defines'] += ['OPENSSL_NO_SSL2=1'] | |
if not options.openssl_use_sys: | |
- o['variables']['node_use_system_openssl'] = b(False) | |
+ o['variables']['node_shared_openssl'] = b(False) | |
else: | |
out = pkg_config('openssl') | |
(libs, cflags) = out if out else ('', '') | |
@@ -355,7 +355,7 @@ def configure_openssl(o): | |
else: | |
o['cflags'] += cflags.split() | |
- o['variables']['node_use_system_openssl'] = b( | |
+ o['variables']['node_shared_openssl'] = b( | |
libs or cflags or options.openssl_libpath or options.openssl_includes) | |
diff --git a/doc/api/process.markdown b/doc/api/process.markdown | |
index ecd1320..35b104d 100644 | |
--- a/doc/api/process.markdown | |
+++ b/doc/api/process.markdown | |
@@ -295,7 +295,7 @@ An example of the possible output looks like: | |
node_shared_zlib: 'false', | |
node_use_dtrace: 'false', | |
node_use_openssl: 'true', | |
- node_use_system_openssl: 'false', | |
+ node_shared_openssl: 'false', | |
strict_aliasing: 'true', | |
target_arch: 'x64', | |
v8_use_snapshot: 'true' } } | |
diff --git a/node.gyp b/node.gyp | |
index 2abdcae..3906d66 100644 | |
--- a/node.gyp | |
+++ b/node.gyp | |
@@ -9,7 +9,7 @@ | |
'node_shared_v8%': 'false', | |
'node_shared_zlib%': 'false', | |
'node_use_openssl%': 'true', | |
- 'node_use_system_openssl%': 'false', | |
+ 'node_shared_openssl%': 'false', | |
'library_files': [ | |
'src/node.js', | |
'lib/_debugger.js', | |
@@ -136,7 +136,7 @@ | |
'defines': [ 'HAVE_OPENSSL=1' ], | |
'sources': [ 'src/node_crypto.cc' ], | |
'conditions': [ | |
- [ 'node_use_system_openssl=="false"', { | |
+ [ 'node_shared_openssl=="false"', { | |
'dependencies': [ './deps/openssl/openssl.gyp:openssl' ], | |
}]] | |
}, { | |
-- | |
1.7.9.5 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment