diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-20 17:00:40 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-08-21 13:22:29 -0700 |
commit | 05b54b4767ff9bd14f0c037d0c2b86447a077b66 (patch) | |
tree | 21f7700c556397a0c3fea746fe402dee13c8ec82 /run_unittests.py | |
parent | 79f8c763268477fdef3f6346d0333b1a3549ab34 (diff) | |
download | meson-05b54b4767ff9bd14f0c037d0c2b86447a077b66.zip meson-05b54b4767ff9bd14f0c037d0c2b86447a077b66.tar.gz meson-05b54b4767ff9bd14f0c037d0c2b86447a077b66.tar.bz2 |
PkgConfigDependency: Parse library paths in a separate step
pkg-config and pkgconf treat additional search paths in
PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR differently when
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 is set.
pkg-config always outputs -L flags for the additional paths first, and
pkgconf always outputs -L flags for the default paths first.
To account for this inconsistency, we now sort the library paths into
two separate sets: system (default) and prefix (additional) paths. We
can do this because we always query pkg-config twice: once with
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 set and once without it.
Then, we ensure that the prefix paths are searched before the system
paths.
Closes https://github.com/mesonbuild/meson/issues/4023
Closes https://github.com/mesonbuild/meson/issues/3951
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py index 2e29af7..262bf7b 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -630,7 +630,7 @@ class InternalTests(unittest.TestCase): if '--libs' not in args: return 0, '' if args[0] == 'foo': - return 0, '-L{} -lfoo -L{} -lbar'.format(p1.as_posix(), p2.as_posix()) + return 0, '-L{} -lfoo -L{} -lbar'.format(p2.as_posix(), p1.as_posix()) if args[0] == 'bar': return 0, '-L{} -lbar'.format(p2.as_posix()) if args[0] == 'internal': |