diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2023-05-17 15:18:07 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2023-05-19 12:50:56 +0000 |
| commit | dfd1c59f14541558e2684a836725d322b73fff4e (patch) | |
| tree | 02b2d26494a0aa149b657e7978675130b019a533 /scripts/install-qt.sh | |
| parent | 6d9cc029235e7fb686923f8bdc75c94ad2d15b55 (diff) | |
Add docker image focal-android-650 and workaround armv7 package
Change-Id: I2a0be7bf2102f738be3fd6b184d21982b359f3b8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'scripts/install-qt.sh')
| -rwxr-xr-x | scripts/install-qt.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 0931693e5..5799fee02 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -357,10 +357,11 @@ for COMPONENT in ${COMPONENTS}; do if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${VERSION}" \< "6.0.0" ]; then CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf" ANDROID_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake" - if [[ "${VERSION}" == "6.4.2" ]] && [[ "${TOOLCHAIN}" == "android_armv7" ]]; then + if [ "${TOOLCHAIN}" == "android_armv7" ] && [ ! "${VERSION}" \< "6.4.2" ]; then sed -i "s/\r//" "${CONF_FILE}" sed -i "s|HostLibraryExecutables=.\/bin|HostLibraryExecutables=.\/libexec|g" "${CONF_FILE}" chmod +x "${ANDROID_QMAKE_FILE}" + sed -i "s|\\\|\/|g" "${ANDROID_QMAKE_FILE}" fi sed -i "s|target|../$TOOLCHAIN|g" "${CONF_FILE}" sed -i "/HostPrefix/ s|$|gcc_64|g" "${CONF_FILE}" |