From 649a983dc168ff0f7a7157e0e9f5da5cf146837c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 19 Mar 2019 23:22:40 -0400 Subject: [PATCH 2/2] Install both binaries and use libdir. This allows us to build with a shared library for other users while still providing the normal executable. Signed-off-by: Elliott Sales de Andrade Signed-off-by: Stephen Gallagher Signed-off-by: rpm-build --- configure.py | 7 +++++++ tools/install.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 187c381660b369bf4d6f9ce7bfddcf23c5b6c46a..3b948a0ffac6653aad12dfb5565ac703adba5f2a 100755 --- a/configure.py +++ b/configure.py @@ -729,6 +729,12 @@ parser.add_argument('--shared', help='compile shared library for embedding node in another project. ' + '(This mode is not officially supported for regular applications)') +parser.add_argument('--libdir', + action='store', + dest='libdir', + default='lib', + help='a directory to install the shared library into') + parser.add_argument('--without-v8-platform', action='store_true', dest='without_v8_platform', @@ -1366,6 +1372,7 @@ def configure_node(o): o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) o['variables']['node_shared'] = b(options.shared) + o['variables']['libdir'] = options.libdir node_module_version = getmoduleversion.get_version() if options.dest_os == 'android': diff --git a/tools/install.py b/tools/install.py index 47e9d8bd7a1ae596a7c6e1d5917f538e81533726..c1afbbf0827ced2e166668e7932504687009bb9e 100755 --- a/tools/install.py +++ b/tools/install.py @@ -143,7 +143,7 @@ def files(action): action([output_prefix + 'libnode.lib'], 'lib/libnode.lib') else: output_lib = 'libnode.' + variables.get('shlib_suffix') - action([output_prefix + output_lib], 'lib/' + output_lib) + action([output_prefix + output_lib], variables.get('libdir') + '/' + output_lib) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') -- 2.35.1