From b3b5f507ee5da271fb92c4b6f13fc5267d432139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Diago=20G=C3=B3mez?= Date: Mon, 7 Sep 2015 23:52:05 +0700 Subject: BoostDependency dylib detection added. --- dependencies.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dependencies.py b/dependencies.py index b3ca400..ca94083 100644 --- a/dependencies.py +++ b/dependencies.py @@ -510,7 +510,14 @@ class BoostDependency(Dependency): self.lib_modules_mt[modname] = fname def detect_lib_modules_nix(self): - globber = 'libboost_*.so' # FIXME, make platform independent. + import platform + libsuffix = None + if platform.system() == 'Darwin': + libsuffix = 'dylib' + elif platform.system() == 'Linux': + libsuffix = 'so' + + globber = 'libboost_*.{}'.format(libsuffix) if self.boost_root is None: libdirs = mesonlib.get_library_dirs() else: -- cgit v1.1 From 89020de121d761a18d7ca0cc8d8fd082a0865bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Diago=20G=C3=B3mez?= Date: Tue, 8 Sep 2015 00:34:54 +0700 Subject: Replaced check for mac osx by mesonlib.is_osx() --- dependencies.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dependencies.py b/dependencies.py index ca94083..fc0f219 100644 --- a/dependencies.py +++ b/dependencies.py @@ -510,11 +510,10 @@ class BoostDependency(Dependency): self.lib_modules_mt[modname] = fname def detect_lib_modules_nix(self): - import platform libsuffix = None - if platform.system() == 'Darwin': + if mesonlib.is_osx(): libsuffix = 'dylib' - elif platform.system() == 'Linux': + else: libsuffix = 'so' globber = 'libboost_*.{}'.format(libsuffix) -- cgit v1.1 From 02897234abc3b606ee5ebc2e92be65da2d0902cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Diago=20G=C3=B3mez?= Date: Tue, 8 Sep 2015 00:35:25 +0700 Subject: Added in authors.txt German Diago Gomez. --- authors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/authors.txt b/authors.txt index 0db0c3d..88e8ba3 100644 --- a/authors.txt +++ b/authors.txt @@ -20,3 +20,4 @@ Mathieu Duponchelle Jouni Roivas Rafaƫl Kooi Marko Raatikainen +German Diago Gomez -- cgit v1.1