diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-05-21 13:35:27 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-05-22 17:07:04 +0300 |
| commit | 5862ad6965c60caa861dfdcd29e499c34c4d00da (patch) | |
| tree | ac86b2dc42c42a150fd01c1682f4bad03dd6ddd8 | |
| parent | 0871b1032c53287a1ed3ce5108799fb0daccaec5 (diff) | |
| download | meson-5862ad6965c60caa861dfdcd29e499c34c4d00da.zip meson-5862ad6965c60caa861dfdcd29e499c34c4d00da.tar.gz meson-5862ad6965c60caa861dfdcd29e499c34c4d00da.tar.bz2 | |
boost: Always sort shared before static (fixes #7171)
| -rw-r--r-- | mesonbuild/dependencies/boost.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 6e85c53..3849704 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -189,13 +189,13 @@ class BoostLibraryFile(): def __lt__(self, other: T.Any) -> bool: if isinstance(other, BoostLibraryFile): return ( - self.mod_name, self.version_lib, self.arch, self.static, + self.mod_name, self.static, self.version_lib, self.arch, not self.mt, not self.runtime_static, not self.debug, self.runtime_debug, self.python_debug, self.stlport, self.deprecated_iostreams, self.name, ) < ( - other.mod_name, other.version_lib, other.arch, other.static, + other.mod_name, other.static, other.version_lib, other.arch, not other.mt, not other.runtime_static, not other.debug, other.runtime_debug, other.python_debug, other.stlport, other.deprecated_iostreams, |