| Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame^] | 1 | From 5862ad6965c60caa861dfdcd29e499c34c4d00da Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Mensinger <daniel@mensinger-ka.de> |
| 3 | Date: Thu, 21 May 2020 13:35:27 +0200 |
| 4 | Subject: [PATCH] boost: Always sort shared before static (fixes #7171) |
| 5 | |
| 6 | --- |
| 7 | mesonbuild/dependencies/boost.py | 4 ++-- |
| 8 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 9 | |
| 10 | diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py |
| 11 | index 6e85c534..38497041 100644 |
| 12 | --- a/mesonbuild/dependencies/boost.py |
| 13 | +++ b/mesonbuild/dependencies/boost.py |
| 14 | @@ -189,13 +189,13 @@ class BoostLibraryFile(): |
| 15 | def __lt__(self, other: T.Any) -> bool: |
| 16 | if isinstance(other, BoostLibraryFile): |
| 17 | return ( |
| 18 | - self.mod_name, self.version_lib, self.arch, self.static, |
| 19 | + self.mod_name, self.static, self.version_lib, self.arch, |
| 20 | not self.mt, not self.runtime_static, |
| 21 | not self.debug, self.runtime_debug, self.python_debug, |
| 22 | self.stlport, self.deprecated_iostreams, |
| 23 | self.name, |
| 24 | ) < ( |
| 25 | - other.mod_name, other.version_lib, other.arch, other.static, |
| 26 | + other.mod_name, other.static, other.version_lib, other.arch, |
| 27 | not other.mt, not other.runtime_static, |
| 28 | not other.debug, other.runtime_debug, other.python_debug, |
| 29 | other.stlport, other.deprecated_iostreams, |
| 30 | -- |
| 31 | 2.26.2 |
| 32 | |