[gtk-osx: 6/48] Adjust libxml2 python-install-dir to use the virtenv's version id.



commit 8fff5551bddad18f7cb8660693252e4ada8f6f06
Author: John Ralls <jralls ceridwen us>
Date:   Thu Nov 1 16:42:33 2018 -0700

    Adjust libxml2 python-install-dir to use the virtenv's version id.

 jhbuildrc-gtk-osx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 80a3660..88cc631 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -528,9 +528,9 @@ if not _ran_recursively and _gtk_osx_prompt_prefix:
 #inside prefix. Note that we need the installed python's version to
 #get the right directory name.
 
-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]])
+if (not "python" in modules and not 'python3' in modules):
+    _python_sitelib = _popen('python -c "from distutils.sysconfig import get_python_lib; 
print(get_python_lib())"')
+    _python_ver = os.path.basename(os.path.dirname(_python_sitelib))
     _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]