Adam Majer
ec89f014ab
since 16.x series, please see https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V17.md#17.3.0 - patches carried from 16.x series with some adaptations include cares_public_headers.patch, fix_ci_tests.patch, flaky_test_rerun.patch, legacy_python.patch, linker_lto_jobs.patch, manual_configure.patch, node-gyp-addon-gypi.patch, nodejs-libpath.patch, npm_search_paths.patch, openssl_binary_detection.patch, skip_no_console.patch, sle12_python3_compat.patch, test-skip-y2038-on-32bit-time_t.patch, versioned.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs17?expand=0&rev=1
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
Index: node-v16.13.0/tools/install.py
|
|
===================================================================
|
|
--- node-v16.13.0.orig/tools/install.py
|
|
+++ node-v16.13.0/tools/install.py
|
|
@@ -7,6 +7,8 @@ import errno
|
|
import os
|
|
import shutil
|
|
import sys
|
|
+from distutils import sysconfig
|
|
+import re
|
|
|
|
# set at init time
|
|
node_prefix = '/usr/local' # PREFIX variable from Makefile
|
|
@@ -65,6 +67,10 @@ def try_copy(path, dst):
|
|
try_unlink(target_path) # prevent ETXTBSY errors
|
|
return shutil.copy2(source_path, target_path)
|
|
|
|
+def libdir():
|
|
+ libdir_fq = sysconfig.get_config_var("LIBDIR")
|
|
+ return re.sub("^" + re.escape(node_prefix + "/"), "", libdir_fq)
|
|
+
|
|
def try_remove(path, dst):
|
|
source_path, target_path = mkpaths(path, dst)
|
|
print('removing %s' % target_path)
|
|
@@ -80,7 +86,7 @@ def uninstall(paths, dst):
|
|
try_remove(path, dst)
|
|
|
|
def package_files(action, name, bins):
|
|
- target_path = 'lib/node_modules/' + name + '/'
|
|
+ target_path = libdir() + '/node_modules/' + name + '/'
|
|
|
|
# don't install npm if the target path is a symlink, it probably means
|
|
# that a dev version of npm is installed there
|
|
@@ -100,7 +106,7 @@ def package_files(action, name, bins):
|
|
if action == uninstall:
|
|
action([link_path], 'bin/' + bin_name)
|
|
elif action == install:
|
|
- try_symlink('../lib/node_modules/' + name + '/' + bin_target, link_path)
|
|
+ try_symlink('../' + libdir() + '/node_modules/' + name + '/' + bin_target, link_path)
|
|
else:
|
|
assert 0 # unhandled action type
|
|
|
|
@@ -148,7 +154,7 @@ def files(action):
|
|
action([output_prefix + output_file], 'lib/' + output_file)
|
|
|
|
if 'true' == variables.get('node_use_dtrace'):
|
|
- action(['out/Release/node.d'], 'lib/dtrace/node.d')
|
|
+ action(['out/Release/node.d'], libdir() + '/dtrace/node.d')
|
|
|
|
# behave similarly for systemtap
|
|
action(['src/node.stp'], 'share/systemtap/tapset/')
|
|
Index: node-v16.13.0/lib/internal/modules/cjs/loader.js
|
|
===================================================================
|
|
--- node-v16.13.0.orig/lib/internal/modules/cjs/loader.js
|
|
+++ node-v16.13.0/lib/internal/modules/cjs/loader.js
|
|
@@ -1234,7 +1234,7 @@ Module._initPaths = function() {
|
|
path.resolve(process.execPath, '..') :
|
|
path.resolve(process.execPath, '..', '..');
|
|
|
|
- const paths = [path.resolve(prefixDir, 'lib', 'node')];
|
|
+ const paths = ['/usr/lib/node'];
|
|
|
|
if (homeDir) {
|
|
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
|