diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-05-21 13:35:27 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-11 12:10:06 +0530 |
| commit | 15b738841b7cabf8e4d2cfbbcbd1090a228904c9 (patch) | |
| tree | 27dd0b632ea7a49c944275af2a15c1efb852c6b3 | |
| parent | bed0bc5c16529a58f978cbced5f426db221b8737 (diff) | |
| download | meson-15b738841b7cabf8e4d2cfbbcbd1090a228904c9.zip meson-15b738841b7cabf8e4d2cfbbcbd1090a228904c9.tar.gz meson-15b738841b7cabf8e4d2cfbbcbd1090a228904c9.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, |