diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2020-02-17 12:55:36 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2020-02-19 15:20:56 +0100 |
| commit | f2be418701f451a4d68a4949d996b873b1836305 (patch) | |
| tree | 7f9b7eb7e989a3c62f3b892315ce70a92eaf1b52 /mkspecs | |
| parent | d34dc3416febbabecaab4bc9635d61ce16d9c81f (diff) | |
| download | qtivi-f2be418701f451a4d68a4949d996b873b1836305.tar.gz | |
Host and use our own copy of "virtualenv --relocatable"
With virtualenv 20, the --relocatable flag got removed
and causes build failures in QtIvi. As we still need
this functionality for making our virtualenv work
after 'make install', we copied the legacy code and
converted it into a standalone python script which
does the job for now.
With virtualenv 20 the complete deploy mechanism changed
and is now based on top on venv. To make the new environment
relocatable we need to copy additional files as well as
read the pyvenv.cfg instead of the old-prefix.txt
Change-Id: Ib77bbd2a1c959693bf1ae6ca478086ce2c848036
Fixes: AUTOSUITE-1482
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ivigenerator.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf index ff01a28..8c07d05 100644 --- a/mkspecs/features/ivigenerator.prf +++ b/mkspecs/features/ivigenerator.prf @@ -62,9 +62,12 @@ qtConfig(system-qface) { } else { equals(QMAKE_HOST.os, Windows) { PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe + # No space between the path and && otherwise python3 adds the space to the path + ENV += set PYTHONHOME=$$system_path($$VIRTUALENV_PATH)&& } else { PYTHON = $$VIRTUALENV_PATH/bin/python ENV += LD_LIBRARY_PATH="$$system_path($$VIRTUALENV_PATH/bin)" + ENV += PYTHONHOME=$$system_path($$VIRTUALENV_PATH) } } IVI_GENERATOR = $$system_quote($$PYTHON) $$IVI_GENERATOR_PATH/generate.py |