[gtk-osx: 32/48] Fix the python version passed to libxml when in a virtualenv.



commit 0e9ad2194ba077a537937cc8ed0278a7dc6716d0
Author: John Ralls <jralls ceridwen us>
Date:   Sat Apr 13 18:32:46 2019 -0700

    Fix the python version passed to libxml when in a virtualenv.
    
    If building in a virtualenv we need to set the python library path to the
    version of python that corresponds to the virtualenv, not the system python2
    that is running jhbuild itself.

 jhbuildrc-gtk-osx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index b362836..0bd1de2 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -578,7 +578,8 @@ if not _ran_recursively and _gtk_osx_prompt_prefix:
 
 if (not "python" in modules and not 'python3' in modules and
     not os.path.exists(os.path.join(prefix, 'bin', 'python2'))):
-    _python_ver = 'python' + '.'.join([str(_x) for _x in sys.version_info[0:2]])
+    _python_ver = _popen('bash -c "python -V"')
+    _python_ver = 'python' + _python_ver.split(" ")[1][0:3]
     _python_install_path = os.path.join(prefix, 'lib',
                                        _python_ver, 'site-packages')
     append_autogenargs('libxml2',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]