GeezerVison is showing github.com — build: add --libdir flag to configure · nodejs/node@e27e709
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: configure.py +9Lines changed: 9 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
735 | 735 | help='compile shared library for embedding node in another project. ' + |
736 | 736 | '(This mode is not officially supported for regular applications)') |
737 | 737 |
|
| 738 | +parser.add_argument('--libdir', |
| 739 | + action='store', |
| 740 | + dest='libdir', |
| 741 | + default='lib', |
| 742 | + help='a directory to install the shared library into relative to the ' |
| 743 | + 'prefix. This is a no-op if --shared is not specified. ' + |
| 744 | + '(This mode is not officially supported for regular applications)') |
| 745 | + |
738 | 746 | parser.add_argument('--without-v8-platform', |
739 | 747 | action='store_true', |
740 | 748 | dest='without_v8_platform', |
@@ -1376,6 +1384,7 @@ def configure_node(o): |
1376 | 1384 | o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) |
1377 | 1385 |
|
1378 | 1386 | o['variables']['node_shared'] = b(options.shared) |
| 1387 | + o['variables']['libdir'] = options.libdir |
1379 | 1388 | node_module_version = getmoduleversion.get_version() |
1380 | 1389 |
|
1381 | 1390 | if options.dest_os == 'android': |
|
Collapse file
Copy file name to clipboardExpand all lines: tools/install.py +2-7Lines changed: 2 additions & 7 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -169,19 +169,14 @@ def files(action): |
169 | 169 |
|
170 | 170 | # install libnode.version.so |
171 | 171 | so_name = 'libnode.' + re.sub(r'\.x$', '.so', variables.get('shlib_suffix')) |
172 | | - action([output_prefix + so_name], 'lib/' + so_name) |
| 172 | + action([output_prefix + so_name], variables.get('libdir') + '/' + so_name) |
173 | 173 |
|
174 | 174 | # create symlink of libnode.so -> libnode.version.so (C++ addons compat) |
175 | 175 | link_path = abspath(install_path, 'lib/libnode.so') |
176 | 176 | try_symlink(so_name, link_path) |
177 | 177 | else: |
178 | 178 | output_lib = 'libnode.' + variables.get('shlib_suffix') |
179 | | - action([output_prefix + output_lib], 'lib/' + output_lib) |
180 | | - if 'true' == variables.get('node_use_dtrace'): |
181 | | - action(['out/Release/node.d'], 'lib/dtrace/node.d') |
182 | | - |
183 | | - # behave similarly for systemtap |
184 | | - action(['src/node.stp'], 'share/systemtap/tapset/') |
| 179 | + action([output_prefix + output_lib], variables.get('libdir') + '/' + output_lib) |
185 | 180 |
|
186 | 181 | action(['deps/v8/tools/gdbinit'], 'share/doc/node/') |
187 | 182 | action(['deps/v8/tools/lldb_commands.py'], 'share/doc/node/') |
|