diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-23 01:01:21 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-23 01:01:21 +0300 |
| commit | 885a3c706fbabc7453aa5a32828d0a6eaee080eb (patch) | |
| tree | 29980519a139f1b76880d6bc0726036c7fadab0b /mesonbuild | |
| parent | 1e3e22c66edfa8172af445026f12d30659e1ead0 (diff) | |
| parent | 3a385ba393423c2012418d05f5140b8b2e8c303d (diff) | |
| download | meson-885a3c706fbabc7453aa5a32828d0a6eaee080eb.zip meson-885a3c706fbabc7453aa5a32828d0a6eaee080eb.tar.gz meson-885a3c706fbabc7453aa5a32828d0a6eaee080eb.tar.bz2 | |
Merged dpkg-architecture fix for Gentoo.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/mesonlib.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index ca72985..067c620 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -181,15 +181,17 @@ def version_compare(vstr1, vstr2): return cmpop(varr1, varr2) def default_libdir(): - try: - pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) - (stdo, _) = pc.communicate() - if pc.returncode == 0: - archpath = stdo.decode().strip() - return 'lib/' + archpath - except Exception: - pass + if is_debianlike(): + try: + pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL) + (stdo, _) = pc.communicate() + if pc.returncode == 0: + archpath = stdo.decode().strip() + return 'lib/' + archpath + except Exception: + pass if os.path.isdir('/usr/lib64') and not os.path.islink('/usr/lib64'): return 'lib64' return 'lib' |