diff options
| author | Niklas Haas <git@haasn.xyz> | 2018-12-09 09:30:54 +0100 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-12-12 10:42:32 -0500 |
| commit | 261ab9b2140005d4f7e42118ccb6598fa5b7f15d (patch) | |
| tree | 67f3113b526ed2eb271e6de7d9e3f74f647b254a /mesonbuild/modules/pkgconfig.py | |
| parent | f0ee06bdab658eb021b911ccffaad2ad31d3e900 (diff) | |
| download | meson-261ab9b2140005d4f7e42118ccb6598fa5b7f15d.zip meson-261ab9b2140005d4f7e42118ccb6598fa5b7f15d.tar.gz meson-261ab9b2140005d4f7e42118ccb6598fa5b7f15d.tar.bz2 | |
pkgconfig: Fix link order of library dependencies
Since `_process_libs` appends the lib's dependencies this list already,
the final return value of `_process_libs` will end up after its
dependencies, which is the wrong way around. (The lib must come first,
then its dependencies)
The easiest solution is to simply pre-pend the return value of
`_process_libs` rather than appending it, so that its dependencies come
after the library itself.
Closes #4091.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index eee3783..47edeee 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -35,13 +35,13 @@ class DependenciesHelper: def add_pub_libs(self, libs): libs, reqs, cflags = self._process_libs(libs, True) - self.pub_libs += libs + self.pub_libs = libs + self.pub_libs # prepend to preserve dependencies self.pub_reqs += reqs self.cflags += cflags def add_priv_libs(self, libs): libs, reqs, _ = self._process_libs(libs, False) - self.priv_libs += libs + self.priv_libs = libs + self.priv_libs self.priv_reqs += reqs def add_pub_reqs(self, reqs): |