Ticket #60165: remove_-rpath_on_Tiger.patch

mesonbuild/modules/gnome.py

@@ -277 +277 @@
         if isinstance(lib, build.SharedLibrary):
             libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib))
             link_command.append('-L' + libdir)
-            if include_rpath:
-                link_command.append('-Wl,-rpath,' + libdir)
             depends.append(lib)
             # Needed for the following binutils bug:
             # https://github.com/mesonbuild/meson/issues/1911
@@ -287 +285 @@
             for d in state.backend.determine_rpath_dirs(lib):
                 d = os.path.join(state.environment.get_build_dir(), d)
                 link_command.append('-L' + d)
-                if include_rpath:
-                    link_command.append('-Wl,-rpath,' + d)
         if use_gir_args and self._gir_has_option('--extra-library'):
             link_command.append('--extra-library=' + lib.name)
         else:
@@ -345 +341 @@
                             getattr(dep, 'is_libtool', False)):
                         lib_dir = os.path.dirname(lib)
                         external_ldflags.update(["-L%s" % lib_dir])
-                        if include_rpath:
-                            external_ldflags.update(['-Wl,-rpath {}'.format(lib_dir)])
                         libname = os.path.basename(lib)
                         if libname.startswith("lib"):
                             libname = libname[3:]

mesonbuild/linkers.py

@@ -678 +678 @@
                         is_shared_module: bool) -> T.List[str]:
         if is_shared_module:
             return []
-        install_name = ['@rpath/', prefix, shlib_name]
+        install_name = ['@loader_path/', prefix, shlib_name]
         if soversion is not None:
             install_name.append('.' + soversion)
         install_name.append('.dylib')
@@ -704 +704 @@
         for rp in all_paths:
             args.extend(self._apply_prefix('-rpath,' + rp))
 
-        return (args, set())
+        return []
 
 
 class GnuDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, DynamicLinker):

mesonbuild/backend/ninjabackend.py

@@ -1554 +1554 @@
                 # now have them. Once slashes are forbidden, remove this bit.
                 target_slashname_workaround_dir = os.path.join(os.path.dirname(target.name),
                                                                self.get_target_dir(target))
-            else:
-                target_slashname_workaround_dir = self.get_target_dir(target)
-            (rpath_args, target.rpath_dirs_to_remove) = \
-                         rustc.build_rpath_args(self.environment,
-                                                self.environment.get_build_dir(),
-                                                target_slashname_workaround_dir,
-                                                self.determine_rpath_dirs(target),
-                                                target.build_rpath,
-                                                target.install_rpath)
-            # ... but then add rustc's sysroot to account for rustup
-            # installations
-            for rpath_arg in rpath_args:
-                args += ['-C', 'link-arg=' + rpath_arg + ':' + os.path.join(rustc.get_sysroot(), 'lib')]
+#            else:
+#                target_slashname_workaround_dir = self.get_target_dir(target)
+#            (rpath_args, target.rpath_dirs_to_remove) = \
+#                         rustc.build_rpath_args(self.environment,
+#                                                self.environment.get_build_dir(),
+#                                                target_slashname_workaround_dir,
+#                                                self.determine_rpath_dirs(target),
+#                                                target.build_rpath,
+#                                                target.install_rpath)
+#            # ... but then add rustc's sysroot to account for rustup
+#            # installations
+#            for rpath_arg in rpath_args:
+#                args += ['-C', 'link-arg=' + rpath_arg + ':' + os.path.join(rustc.get_sysroot(), 'lib')]
         compiler_name = self.get_compiler_rule_name('rust', target.for_machine)
         element = NinjaBuildElement(self.all_outputs, target_name, compiler_name, main_rust_file)
         if len(orderdeps) > 0:
@@ -2776 +2776 @@
             target_slashname_workaround_dir = os.path.join(
                 os.path.dirname(target.name),
                 self.get_target_dir(target))
-        else:
-            target_slashname_workaround_dir = self.get_target_dir(target)
-        (rpath_args, target.rpath_dirs_to_remove) = \
-                    linker.build_rpath_args(self.environment,
-                                            self.environment.get_build_dir(),
-                                            target_slashname_workaround_dir,
-                                            self.determine_rpath_dirs(target),
-                                            target.build_rpath,
-                                            target.install_rpath)
-        commands += rpath_args
+#        else:
+#            target_slashname_workaround_dir = self.get_target_dir(target)
+#        (rpath_args, target.rpath_dirs_to_remove) = \
+#                    linker.build_rpath_args(self.environment,
+#                                            self.environment.get_build_dir(),
+#                                            target_slashname_workaround_dir,
+#                                            self.determine_rpath_dirs(target),
+#                                            target.build_rpath,
+#                                            target.install_rpath)
+#        commands += rpath_args
         # Add libraries generated by custom targets
         custom_target_libraries = self.get_custom_target_provided_libraries(target)
         commands += extra_args