| From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001 |
| From: Daniel Mensinger <daniel@mensinger-ka.de> |
| Date: Thu, 21 May 2020 13:35:27 +0200 |
| Subject: [PATCH] boost: Always sort shared before static (fixes #7171) |
| |
| --- |
| mesonbuild/dependencies/boost.py | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py |
| index 6e85c534..38497041 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, |
| -- |
| 2.26.2 |
| |