File nodejs-libpath.patch of Package nodejs10.15322

Overview Repositories Revisions Requests Users Attributes Meta

File nodejs-libpath.patch of Package nodejs10.15322

Index: node-v9.11.1/tools/install.py
===================================================================
--- node-v9.11.1.orig/tools/install.py
+++ node-v9.11.1/tools/install.py
@@ -6,6 +6,7 @@ import os
 import re
 import shutil
 import sys
+from distutils import sysconfig
 from getmoduleversion import get_version
 
 # set at init time
@@ -77,7 +78,7 @@ def install(paths, dst): map(lambda path
 def uninstall(paths, dst): map(lambda path: try_remove(path, dst), paths)
 
 def npm_files(action):
-  target_path = 'lib/node_modules/npm/'
+  target_path = sysconfig.get_config_var("LIB") + '/node_modules/npm/'
 
   # don't install npm if the target path is a symlink, it probably means
   # that a dev version of npm is installed there
@@ -95,7 +96,7 @@ def npm_files(action):
   if action == uninstall:
     action([link_path], 'bin/npm')
   elif action == install:
-    try_symlink('../lib/node_modules/npm/bin/npm-cli.js', link_path)
+    try_symlink("../" + sysconfig.get_config_var("LIB") + '/node_modules/npm/bin/npm-cli.js',link_path)
   else:
     assert(0) # unhandled action type
 
@@ -140,7 +141,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'], sysconfig.get_config_var("LIB") + '/dtrace/node.d')
 
   # behave similarly for systemtap
   action(['src/node.stp'], 'share/systemtap/tapset/')
Index: node-v9.11.1/lib/internal/modules/cjs/loader.js
===================================================================
--- node-v9.11.1.orig/lib/internal/modules/cjs/loader.js
+++ node-v9.11.1/lib/internal/modules/cjs/loader.js
@@ -716,7 +716,7 @@ Module._initPaths = function() {
   } else {
     prefixDir = path.resolve(process.execPath, '..', '..');
   }
-  var paths = [path.resolve(prefixDir, 'lib', 'node')];
+  var paths = ['/usr/lib/node'];
 
   if (homeDir) {
     paths.unshift(path.resolve(homeDir, '.node_libraries'));

Places

File nodejs-libpath.patch of Package nodejs10.15322

Places