This commit is contained in:
parent
d8b9b394de
commit
38a579f0dc
@ -14,7 +14,7 @@ Index: node-v20.12.0/tools/install.py
|
|||||||
try_unlink(target_path) # prevent ETXTBSY errors
|
try_unlink(target_path) # prevent ETXTBSY errors
|
||||||
return shutil.copy2(source_path, target_path)
|
return shutil.copy2(source_path, target_path)
|
||||||
|
|
||||||
+def libdir():
|
+def libdir(options):
|
||||||
+ libdir_fq = sysconfig.get_config_var("LIBDIR")
|
+ libdir_fq = sysconfig.get_config_var("LIBDIR")
|
||||||
+ return re.sub("^" + re.escape(options.prefix + "/"), "", libdir_fq)
|
+ return re.sub("^" + re.escape(options.prefix + "/"), "", libdir_fq)
|
||||||
+
|
+
|
||||||
@ -26,7 +26,7 @@ Index: node-v20.12.0/tools/install.py
|
|||||||
|
|
||||||
def package_files(options, action, name, bins):
|
def package_files(options, action, name, bins):
|
||||||
- target_path = os.path.join('lib/node_modules', name)
|
- target_path = os.path.join('lib/node_modules', name)
|
||||||
+ target_path = os.path.join(libdir(), 'node_modules', name)
|
+ target_path = os.path.join(libdir(options), 'node_modules', name)
|
||||||
|
|
||||||
# don't install npm if the target path is a symlink, it probably means
|
# don't install npm if the target path is a symlink, it probably means
|
||||||
# that a dev version of npm is installed there
|
# that a dev version of npm is installed there
|
||||||
@ -35,7 +35,7 @@ Index: node-v20.12.0/tools/install.py
|
|||||||
action(options, [link_path], os.path.join('bin', bin_name))
|
action(options, [link_path], os.path.join('bin', bin_name))
|
||||||
elif action == install:
|
elif action == install:
|
||||||
- try_symlink(options, os.path.join('../lib/node_modules', name, bin_target), link_path)
|
- try_symlink(options, os.path.join('../lib/node_modules', name, bin_target), link_path)
|
||||||
+ try_symlink(options, os.path.join('..', libdir(), 'node_modules', name, bin_target), link_path)
|
+ try_symlink(options, os.path.join('..', libdir(options), 'node_modules', name, bin_target), link_path)
|
||||||
else:
|
else:
|
||||||
assert 0 # unhandled action type
|
assert 0 # unhandled action type
|
||||||
|
|
||||||
|
@ -29,8 +29,8 @@ Index: node-v20.12.0/tools/install.py
|
|||||||
try_remove(options, path, dest)
|
try_remove(options, path, dest)
|
||||||
|
|
||||||
def package_files(options, action, name, bins):
|
def package_files(options, action, name, bins):
|
||||||
- target_path = os.path.join(libdir(), 'node_modules', name)
|
- target_path = os.path.join(libdir(options), 'node_modules', name)
|
||||||
+ target_path = os.path.join(libdir(), 'node_modules', name + '20')
|
+ target_path = os.path.join(libdir(options), 'node_modules', name + '20')
|
||||||
|
|
||||||
# don't install npm if the target path is a symlink, it probably means
|
# don't install npm if the target path is a symlink, it probably means
|
||||||
# that a dev version of npm is installed there
|
# that a dev version of npm is installed there
|
||||||
@ -38,8 +38,8 @@ Index: node-v20.12.0/tools/install.py
|
|||||||
if action == uninstall:
|
if action == uninstall:
|
||||||
action(options, [link_path], os.path.join('bin', bin_name))
|
action(options, [link_path], os.path.join('bin', bin_name))
|
||||||
elif action == install:
|
elif action == install:
|
||||||
- try_symlink(options, os.path.join('..', libdir(), 'node_modules', name, bin_target), link_path)
|
- try_symlink(options, os.path.join('..', libdir(options), 'node_modules', name, bin_target), link_path)
|
||||||
+ try_symlink(options, os.path.join('..', libdir(), 'node_modules', name + '20', bin_target), link_path)
|
+ try_symlink(options, os.path.join('..', libdir(options), 'node_modules', name + '20', bin_target), link_path)
|
||||||
else:
|
else:
|
||||||
assert 0 # unhandled action type
|
assert 0 # unhandled action type
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user