From 36fada80ad9b1f80c248a12738c6eb011302ce4e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jan 2021 06:16:15 +0100 Subject: [PATCH 1/6] Revert "qt: Fix Android build" This reverts commit bb55d132e2e9e4d96e330598cb56bf013e6e5d89. --- qt-5.12.10.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt-5.12.10.cmake b/qt-5.12.10.cmake index ab63199..13158e8 100644 --- a/qt-5.12.10.cmake +++ b/qt-5.12.10.cmake @@ -30,7 +30,7 @@ set(short_version 5.12) set(version 5.12.7) set(patch_version ${version}-0) -set(openorienteering_version ${version}-qtbase-5.12.10-1) +set(openorienteering_version ${version}-qtbase-5.12.10-0) option(USE_SYSTEM_QT "Use the system Qt if possible" ON) @@ -102,7 +102,7 @@ superbuild_package( SOURCE URL https://github.com/OpenOrienteering/superbuild/archive/qt-${short_version}-openorienteering_${openorienteering_version}.tar.gz - URL_HASH SHA256=fc5031097b0c4750f59ba28f84df08c5e378499267681902ad1b3b32435b0162 + URL_HASH SHA256=fa6bd764f42b32bdf3cea6999d26edb319f41cf1dba4995b062e31740076e5fe ) @@ -110,7 +110,7 @@ superbuild_package( # qtbase set(qtbase_version 5.12.10) -set(qtbase_patch_version ${qtbase_version}-1) +set(qtbase_patch_version ${qtbase_version}-0) superbuild_package( NAME qtbase VERSION ${short_version} From 24d76e27600b96a0ccde797cc3c8cd0445a195df Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jan 2021 06:19:26 +0100 Subject: [PATCH 2/6] ci: Disable everything but Android arm --- ci/azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index e4ecfd8..c774322 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -36,6 +36,7 @@ jobs: - job: macOS + condition: False timeoutInMinutes: 120 dependsOn: Source variables: @@ -60,6 +61,7 @@ jobs: - job: Linux + condition: False timeoutInMinutes: 120 dependsOn: macOS variables: @@ -158,6 +160,7 @@ jobs: - template: publish.yml - job: Android_x86 + condition: False timeoutInMinutes: 120 dependsOn: Android_x86_64 variables: @@ -185,6 +188,7 @@ jobs: - template: publish.yml - job: Android_x86_64 + condition: False timeoutInMinutes: 120 dependsOn: Source variables: @@ -212,6 +216,7 @@ jobs: - template: publish.yml - job: Windows_mingw32 + condition: False timeoutInMinutes: 240 dependsOn: Source variables: @@ -244,6 +249,7 @@ jobs: outputSuffix: -$(MINGW) - job: Windows_mingw64 + condition: False timeoutInMinutes: 240 dependsOn: Source variables: From 3c98c9114b973ee57bb4799e729fbcc4ef7af452 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jan 2021 06:25:17 +0100 Subject: [PATCH 3/6] Report Android SDK info --- ci/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/build.yml b/ci/build.yml index 7a0bb5e..11184d6 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -74,6 +74,9 @@ steps: -- ${{ parameters.buildArgs }} displayName: 'Toolchain information' +- bash: ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list + displayName: 'SDK info' + - task: CMake@1 inputs: workingDirectory: 'build' From 94aa0791e4cafdfcf26ba0f1433f28055cc64181 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jan 2021 19:06:42 +0100 Subject: [PATCH 4/6] qt: Build with ANDROID_API_VERSION android-28 --- qt-5.12.10.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qt-5.12.10.cmake b/qt-5.12.10.cmake index 13158e8..7a31b20 100644 --- a/qt-5.12.10.cmake +++ b/qt-5.12.10.cmake @@ -184,6 +184,7 @@ superbuild_package( --unset=CXXFLAGS --unset=LDFLAGS $<@android@: + ANDROID_API_VERSION=android-28 # Required to satisfy qconfigure.pri PKG_CONFIG_SYSROOT_DIR=set-but-not-used PKG_CONFIG_LIBDIR=set-but-not-used @@ -261,6 +262,9 @@ superbuild_package( > -I "${CMAKE_STAGING_PREFIX}/include" -L "${CMAKE_STAGING_PREFIX}/lib" + BUILD_COMMAND + $<@android@:"${CMAKE_COMMAND}" -E env ANDROID_API_VERSION=android-28> + "$(MAKE)" INSTALL_COMMAND "$(MAKE)" install INSTALL_ROOT=${DESTDIR} $<@android@: From 478f9814f60544d77b570c7dfa3ab7abf9575c95 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 9 Jan 2021 06:09:15 +0100 Subject: [PATCH 5/6] qt: WIP --- qt-5.12.10.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-5.12.10.cmake b/qt-5.12.10.cmake index 7a31b20..958630a 100644 --- a/qt-5.12.10.cmake +++ b/qt-5.12.10.cmake @@ -184,7 +184,7 @@ superbuild_package( --unset=CXXFLAGS --unset=LDFLAGS $<@android@: - ANDROID_API_VERSION=android-28 + ANDROID_API_VERSION=android-23 # Required to satisfy qconfigure.pri PKG_CONFIG_SYSROOT_DIR=set-but-not-used PKG_CONFIG_LIBDIR=set-but-not-used From f3fc1b8fa4f1064061e391506f783740f5abecf1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 9 Jan 2021 06:48:08 +0100 Subject: [PATCH 6/6] qt: WIP --- qt-5.12.10.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt-5.12.10.cmake b/qt-5.12.10.cmake index 958630a..366895c 100644 --- a/qt-5.12.10.cmake +++ b/qt-5.12.10.cmake @@ -184,7 +184,7 @@ superbuild_package( --unset=CXXFLAGS --unset=LDFLAGS $<@android@: - ANDROID_API_VERSION=android-23 + #ANDROID_API_VERSION=android-23 # Required to satisfy qconfigure.pri PKG_CONFIG_SYSROOT_DIR=set-but-not-used PKG_CONFIG_LIBDIR=set-but-not-used @@ -262,8 +262,9 @@ superbuild_package( > -I "${CMAKE_STAGING_PREFIX}/include" -L "${CMAKE_STAGING_PREFIX}/lib" + ANDROID_API_VERSION=android-24 BUILD_COMMAND - $<@android@:"${CMAKE_COMMAND}" -E env ANDROID_API_VERSION=android-28> + #$<@android@:"${CMAKE_COMMAND}" -E env ANDROID_API_VERSION=android-28> "$(MAKE)" INSTALL_COMMAND "$(MAKE)" install INSTALL_ROOT=${DESTDIR}