File use_libdir_forlib.patch of Package nodejs16

Overview Repositories Revisions Requests Users Attributes Meta

File use_libdir_forlib.patch of Package nodejs16

Index: node-v16.18.0/tools/install.py
===================================================================
--- node-v16.18.0.orig/tools/install.py
+++ node-v16.18.0/tools/install.py
@@ -180,8 +180,10 @@ def files(action):
       link_path = abspath(install_path, 'lib/libnode.so')
       try_symlink(so_name, link_path)
     else:
-      output_lib = 'libnode.' + variables.get('shlib_suffix')
-      action([output_prefix + output_lib], variables.get('libdir') + '/' + output_lib)
+      exe_output_file = output_file
+      lib_output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix')
+      action([output_prefix + exe_output_file], 'bin/' + exe_output_file)
+      action([output_prefix + lib_output_file], libdir() + '/' + lib_output_file)
   if 'true' == variables.get('node_use_dtrace'):
     action(['out/Release/node.d'], 'lib/dtrace/node.d')
 
Index: node-v16.18.0/node.gyp
===================================================================
--- node-v16.18.0.orig/node.gyp
+++ node-v16.18.0/node.gyp
@@ -254,11 +254,11 @@
             'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', '-Wl,-rpath,@loader_path/../lib'],
           },
           'conditions': [
-            ['OS=="linux"', {
-               'ldflags': [
-                 '-Wl,-rpath,\\$$ORIGIN/../lib'
-               ],
-            }],
+          # ['OS=="linux"', {
+          #    'ldflags': [
+          #      '-Wl,-rpath,\\$$ORIGIN/../lib'
+          #    ],
+          # }],
           ],
         }],
         [ 'enable_lto=="true"', {
Index: node-v16.18.0/tools/gyp/pylib/gyp/generator/make.py
===================================================================
--- node-v16.18.0.orig/tools/gyp/pylib/gyp/generator/make.py
+++ node-v16.18.0/tools/gyp/pylib/gyp/generator/make.py
@@ -1664,7 +1664,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
                     if any(dep.endswith(".so") or ".so." in dep for dep in deps):
                         # We want to get the literal string "$ORIGIN"
                         # into the link command, so we need lots of escaping.
-                        ldflags.append(r"-Wl,-rpath=\$$ORIGIN/")
+                        # ldflags.append(r"-Wl,-rpath=\$$ORIGIN/")
                         ldflags.append(r"-Wl,-rpath-link=\$(builddir)/")
                 library_dirs = config.get("library_dirs", [])
                 ldflags += [("-L%s" % library_dir) for library_dir in library_dirs]

Places

File use_libdir_forlib.patch of Package nodejs16

Places