Resolves: RHBZ#1953491
Rebase patch
This commit is contained in:
parent
2ee4eb77cd
commit
6be529b23e
@ -1,41 +1,21 @@
|
|||||||
From 45a9bca165f6ed76c4e43cc2cc3fdf596814bc77 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
||||||
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 <quantum.analyst@gmail.com>
|
|
||||||
---
|
|
||||||
configure.py | 7 +++++++
|
|
||||||
tools/install.py | 21 +++++++++------------
|
|
||||||
2 files changed, 16 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.py b/configure.py
|
diff --git a/configure.py b/configure.py
|
||||||
index e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed80fde88a 100755
|
index 895a0869cb..791c3e4a62 100755
|
||||||
--- a/configure.py
|
--- a/configure.py
|
||||||
+++ b/configure.py
|
+++ b/configure.py
|
||||||
@@ -624,10 +624,16 @@ parser.add_option('--shared',
|
@@ -722,6 +722,12 @@ parser.add_argument('--shared',
|
||||||
action='store_true',
|
|
||||||
dest='shared',
|
|
||||||
help='compile shared library for embedding node in another project. ' +
|
help='compile shared library for embedding node in another project. ' +
|
||||||
'(This mode is not officially supported for regular applications)')
|
'(This mode is not officially supported for regular applications)')
|
||||||
|
|
||||||
+parser.add_option('--libdir',
|
+parser.add_argument('--libdir',
|
||||||
+ action='store',
|
+ action='store',
|
||||||
+ dest='libdir',
|
+ dest='libdir',
|
||||||
+ default='lib',
|
+ default='lib',
|
||||||
+ help='a directory to install the shared library into')
|
+ help='a directory to install the shared library into')
|
||||||
+
|
+
|
||||||
parser.add_option('--without-v8-platform',
|
parser.add_argument('--without-v8-platform',
|
||||||
action='store_true',
|
action='store_true',
|
||||||
dest='without_v8_platform',
|
dest='without_v8_platform',
|
||||||
default=False,
|
@@ -1293,6 +1299,7 @@ def configure_node(o):
|
||||||
help='do not initialize v8 platform during node.js startup. ' +
|
|
||||||
@@ -1200,10 +1206,11 @@ def configure_node(o):
|
|
||||||
o['variables']['debug_nghttp2'] = 'false'
|
|
||||||
|
|
||||||
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
|
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
|
||||||
|
|
||||||
o['variables']['node_shared'] = b(options.shared)
|
o['variables']['node_shared'] = b(options.shared)
|
||||||
@ -43,15 +23,11 @@ index e6f7e4db0040dda00e432352afa7576535d9b672..6cf5c45dde79ce355b532c2f11b5b7ed
|
|||||||
node_module_version = getmoduleversion.get_version()
|
node_module_version = getmoduleversion.get_version()
|
||||||
|
|
||||||
if options.dest_os == 'android':
|
if options.dest_os == 'android':
|
||||||
shlib_suffix = 'so'
|
|
||||||
elif sys.platform == 'darwin':
|
|
||||||
diff --git a/tools/install.py b/tools/install.py
|
diff --git a/tools/install.py b/tools/install.py
|
||||||
index 729b416fc47d3ff3317ae3671dee977c719a8841..9bfc6234edb7732f9b90f063c2ee4a276e840636 100755
|
index 045d406d84..b3ef454199 100755
|
||||||
--- a/tools/install.py
|
--- a/tools/install.py
|
||||||
+++ b/tools/install.py
|
+++ b/tools/install.py
|
||||||
@@ -119,26 +119,23 @@ def subdir_files(path, dest, action):
|
@@ -121,22 +121,19 @@ def subdir_files(path, dest, action):
|
||||||
for subdir, files_in_path in ret.items():
|
|
||||||
action(files_in_path, subdir + '/')
|
|
||||||
|
|
||||||
def files(action):
|
def files(action):
|
||||||
is_windows = sys.platform == 'win32'
|
is_windows = sys.platform == 'win32'
|
||||||
@ -83,8 +59,3 @@ index 729b416fc47d3ff3317ae3671dee977c719a8841..9bfc6234edb7732f9b90f063c2ee4a27
|
|||||||
|
|
||||||
if 'true' == variables.get('node_use_dtrace'):
|
if 'true' == variables.get('node_use_dtrace'):
|
||||||
action(['out/Release/node.d'], 'lib/dtrace/node.d')
|
action(['out/Release/node.d'], 'lib/dtrace/node.d')
|
||||||
|
|
||||||
# behave similarly for systemtap
|
|
||||||
--
|
|
||||||
2.29.2
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user