Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
gobject-introspection: tweak scanner patch
Now handles build-provided library paths more robustly, removing those that are found via PKGCONFIG and are thus clearly "system" paths. Ref: https://trac.macports.org/ticket/61382
- Loading branch information
Showing
2 changed files
with
11 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
args.append('-L.') | ||
--- giscanner/dumper.py.orig | ||
+++ giscanner/dumper.py | ||
@@ -236,8 +236,20 @@ | ||
@@ -236,8 +236,29 @@ | ||
|
||
args.extend(sources) | ||
|
||
|
@@ -24,6 +24,15 @@ | |
+ self._packages, msvc_syntax=self._compiler.check_is_msvc()) | ||
+ this_L = [lib[len('-L'):] for lib in pkg_config_libs_only_L] | ||
+ | ||
+ # remove self._options.library_paths entries that are in | ||
+ # "this_L" already, since those are "system" and will be found | ||
+ # via the "runtime_path_envvar" setting below | ||
+ tmp_L = [] | ||
+ for t_L in self._options.library_paths: | ||
+ if t_L not in this_L: | ||
+ tmp_L.append (t_L) | ||
+ self._options.library_paths = tmp_L | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
michaelld
Author
Contributor
|
||
+ | ||
+ if os.name == 'nt': | ||
+ runtime_path_envvar = ['LIB', 'PATH'] | ||
+ else: | ||
|
@michaelld