Ticket #62391: patch-fix-scanner-in-build-execution.diff

giscanner/ccompiler.py

@@ -184 +184 @@
         if os.name == 'nt':
             runtime_path_envvar = ['LIB', 'PATH']
         else:
-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
+            if sys.platform == "darwin":
+                runtime_path_envvar = ['DYLD_LIBRARY_PATH']
+            else:
+                runtime_path_envvar = ['LD_LIBRARY_PATH']
             # Search the current directory first
             # (This flag is not supported nor needed for Visual C++)
             args.append('-L.')

giscanner/dumper.py

@@ -236 +236 @@
 
         args.extend(sources)
 
-        pkg_config_libs = pkgconfig.libs(self._packages,
-                                         msvc_syntax=self._compiler.check_is_msvc())
+        pkg_config_libs, pkg_config_libs_only_L = pkgconfig.libs(
+            self._packages, msvc_syntax=self._compiler.check_is_msvc())
+        this_L = [lib[len('-L'):] for lib in pkg_config_libs_only_L]
+
+        # uniquely merge pkg_config and options library paths
+        # set() returns them in random order, so sort them for predictiveness
+        library_paths = sorted (set().union (self._options.library_paths,
+                                                         this_L))
+
+        # remove anything in LIBRARY_PATH
+        env_LIBRARY_PATH = os.environ['LIBRARY_PATH'].split(':') if \
+            'LIBRARY_PATH' in os.environ else []
+        library_paths = [l for l in library_paths if l not in env_LIBRARY_PATH]
+
+        if os.name == 'nt':
+            runtime_path_envvar = ['LIB', 'PATH']
+        else:
+            runtime_path_envvar = ['LIBRARY_PATH']
+        for envvar in runtime_path_envvar:
+            os.environ[envvar] = os.pathsep.join \
+                (sorted (set().union (os.environ[envvar].split(':'), this_L))) \
+                    if envvar in os.environ else os.pathsep.join(this_L)
 
         if not self._options.external_library:
             self._compiler.get_internal_link_flags(args,
                                                    libtool,
                                                    self._options.libraries,
                                                    self._options.extra_libraries,
-                                                   self._options.library_paths)
+                                                   library_paths)
             args.extend(pkg_config_libs)
 
         else:

giscanner/pkgconfig.py

@@ -52 +52 @@
 
 def libs(packages, msvc_syntax=False, ignore_errors=True, command=None):
     flags = ['--msvc-syntax'] if msvc_syntax else []
-    flags.append('--libs')
+    flags.append('--libs-only-l')
+    flags.append('--libs-only-other')
     flags.extend(packages)
-    out = check_output(flags, ignore_errors, command)
-    return shlex.split(out)
+    out_libs_only_not_L = shlex.split(check_output(flags, ignore_errors, command))
+    flags = ['--msvc-syntax'] if msvc_syntax else []
+    flags.append('--libs-only-L')
+    flags.extend(packages)
+    out_libs_only_L = shlex.split(check_output(flags, ignore_errors, command))
+    return out_libs_only_not_L, out_libs_only_L