aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2016-07-04 12:55:29 -0400
committerThibault Saunier <tsaunier@gnome.org>2016-07-04 13:01:23 -0400
commita23f5774150225951ed9d04c2377218c2369390b (patch)
treed61181b0036588db08f1826a94cc1d4ffe3eb3b4
parentd6ab5027feac5e3c784e9a6577cbe790c9082643 (diff)
downloadmeson-a23f5774150225951ed9d04c2377218c2369390b.zip
meson-a23f5774150225951ed9d04c2377218c2369390b.tar.gz
meson-a23f5774150225951ed9d04c2377218c2369390b.tar.bz2
dependencies: Add a get_version method to Python3Dependency
Otherwise ninja files regeneration fails with: AttributeError: 'Python3Dependency' object has no attribute 'get_version'
-rw-r--r--mesonbuild/dependencies.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
index 544291b..2b77706 100644
--- a/mesonbuild/dependencies.py
+++ b/mesonbuild/dependencies.py
@@ -1105,11 +1105,13 @@ class Python3Dependency(Dependency):
super().__init__()
self.name = 'python3'
self.is_found = False
+ self.version = "3.something_maybe"
try:
pkgdep = PkgConfigDependency('python3', environment, kwargs)
if pkgdep.found():
self.cargs = pkgdep.cargs
self.libs = pkgdep.libs
+ self.version = pkgdep.get_version()
self.is_found = True
return
except Exception:
@@ -1127,6 +1129,7 @@ class Python3Dependency(Dependency):
self.libs = ['-L{}/libs'.format(basedir),
'-lpython{}'.format(vernum)]
self.is_found = True
+ self.version = sysconfig.get_config_var('py_version_short')
elif mesonlib.is_osx():
# In OSX the Python 3 framework does not have a version
# number in its name.
@@ -1146,6 +1149,9 @@ class Python3Dependency(Dependency):
def get_link_args(self):
return self.libs
+ def get_version(self):
+ return self.version
+
def get_dep_identifier(name, kwargs):
elements = [name]
modlist = kwargs.get('modules', [])