From 3501f0d01d88fce978c57253132ca33b28fc2f70 Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Thu, 27 Aug 2020 18:42:02 +0200
Subject: [PATCH] Fixed qt install script
---
config/components/ui/qt.lib.yml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/config/components/ui/qt.lib.yml b/config/components/ui/qt.lib.yml
index 13969ad..ad33fce 100644
--- a/config/components/ui/qt.lib.yml
+++ b/config/components/ui/qt.lib.yml
@@ -101,18 +101,21 @@ builds:
cd "$BUILD_DIR"
(@= make @)
- (@= make @) install INSTALL_ROOT=$DESTDIR
+ (@= make @) install INSTALL_ROOT=$TMP_ROOT
- rm $DESTDIR/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
- touch $DESTDIR/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
- find $DESTDIR \( -name "*.pri" -or -name "*.pc" -or -name "*.pri" \) \
+ rm "${TMP_ROOT}${ORCHESTRA_ROOT}/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake"
+ touch "${TMP_ROOT}${ORCHESTRA_ROOT}/lib64/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake"
+ find "${TMP_ROOT}${ORCHESTRA_ROOT}" \( -name "*.pri" -or -name "*.pc" -or -name "*.pri" \) \
-exec sed 's|/[^; ]*/lib\([^; ]*\)\.so|-l\1|g' {} -i ";"
- cat > $DESTDIR/bin/qt.conf <<EOF
+ cat > "${TMP_ROOT}${ORCHESTRA_ROOT}/bin/qt.conf" <<EOF
[Paths]
Prefix = $ORCHESTRA_ROOT
EOF
#@ end
+dependencies:
+ - clang-release
+ - toolchain/host/gcc
#@ end
---
--
GitLab