summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2020-12-01 18:05:31 +0100
committerDominik Holland <dominik.holland@qt.io>2020-12-02 10:46:50 +0100
commit21b7efb998d875e52a36a7282af6b06f9eed942d (patch)
tree09545d29327bf42a972b7b2740da6f08d857a4a8 /src
parent40d910a4af4bce75580a48eaa02ef2c0cbb595e3 (diff)
downloadqtivi-21b7efb998d875e52a36a7282af6b06f9eed942d.tar.gz
ivigenerator: Make sure deploy-virtualenv.sh is able to fix the lib64 folder
On centos the virtualenv contains a lib64 folder which contains all site-packages. To make deploy the virtualenv this folder needs to be replaced by a symlink to the lib folder (which contains all modules/libs). The content of lib64 needs to be copied before the sym-link can be created. Change-Id: I0ec254dc5b16c6f5d94e6b5c6bc9f82252762a1f Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/tools/ivigenerator/deploy-virtualenv.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/ivigenerator/deploy-virtualenv.sh b/src/tools/ivigenerator/deploy-virtualenv.sh
index 1aa792f..2059c30 100755
--- a/src/tools/ivigenerator/deploy-virtualenv.sh
+++ b/src/tools/ivigenerator/deploy-virtualenv.sh
@@ -117,7 +117,8 @@ fi
chmod -R ug+rw $VIRTUALENV
if [ "$(readlink -- "$VIRTUALENV/lib64")" != "lib" ] ; then
- rm -f "$VIRTUALENV/lib64"
+ cp -a "$VIRTUALENV/lib64"/* "$VIRTUALENV/lib/"
+ rm -rf "$VIRTUALENV/lib64"
cd "$VIRTUALENV"
ln -s lib lib64
cd -