Fix kirogi compilation on binary-factory
AbandonedPublic

Authored by jjazeix on Feb 27 2020, 7:20 PM.

Details

Reviewers
None
Group Reviewers
Kirogi
Summary

This should fix the compilation error in https://binary-factory.kde.org/view/Android/job/Kirogi_android/
It was introduced by https://cgit.kde.org/kirogi.git/commit/?id=078ff5ec50588557309df53879bea1f80584ca84
I think the change of order of headers include broke the compilation.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
jjazeix requested review of this revision.Feb 27 2020, 7:20 PM
jjazeix created this revision.
jjazeix abandoned this revision.Mar 8 2020, 3:54 PM

commited a few days ago

patrickelectric added a subscriber: patrickelectric.EditedMar 8 2020, 5:49 PM

Hi @jjazeix this did fix the android build, but now it's failing with libQtZeroConf, and after your fix with:

qrc:/FlightControls.qml:29 module "org.kde.kirogi.video" is not installed

Hi @jjazeix this did fix the android build, but now it's failing with libQtZeroConf, and after your fix with:

qrc:/FlightControls.qml:29 module "org.kde.kirogi.video" is not installed

Hi, you're right, https://binary-factory.kde.org/view/Android/job/Kirogi_android/ it compiled with my fix on #222 but from #224, it does not find libQtZeroConf.so (#223 didn't find Doxygen but was not reproduced)

Looking at the logs, it seems the generated library has a different name than before:
On https://binary-factory.kde.org/view/Android/job/Kirogi_android/222/consoleFull (working): 22:28:17 + cp /libs/armeabi-v7a/libQtZeroConf.so /opt/kdeandroid-deps/lib/
On https://binary-factory.kde.org/view/Android/job/Kirogi_android/lastBuild/consoleFull (last build): 20:50:24 /opt/Qt/bin/qmake -install qinstall -exe libQtZeroConf_arm64-v8a.so /libs/arm64-v8a/libQtZeroConf_arm64-v8a.so

@apol @vkrause I recently saw some diff regarding android, could it be the cause?

Hi, you're right, https://binary-factory.kde.org/view/Android/job/Kirogi_android/ it compiled with my fix on #222 but from #224, it does not find libQtZeroConf.so (#223 didn't find Doxygen but was not reproduced)

Looking at the logs, it seems the generated library has a different name than before:
On https://binary-factory.kde.org/view/Android/job/Kirogi_android/222/consoleFull (working): 22:28:17 + cp /libs/armeabi-v7a/libQtZeroConf.so /opt/kdeandroid-deps/lib/
On https://binary-factory.kde.org/view/Android/job/Kirogi_android/lastBuild/consoleFull (last build): 20:50:24 /opt/Qt/bin/qmake -install qinstall -exe libQtZeroConf_arm64-v8a.so /libs/arm64-v8a/libQtZeroConf_arm64-v8a.so

@apol @vkrause I recently saw some diff regarding android, could it be the cause?

The changed library name is likely due to the Qt 5.14 update, specifically its multi-arch capability. Libraries (and the app binary) are now suffixed with the architecture.