nathan/slide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

fix qmake
Some checks failed
continuous-integration/drone/push Build encountered an error
Details

Browse Source
This commit is contained in:
Nathan Coad
2026-01-31 21:20:43 +11:00
parent 3547207eca
commit 945e3212cf
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.drone.yml
View File

@@ -3,15 +3,15 @@ type: docker
name: build
steps:
- name: build-deb-amd64
image: cache.coadcorp.com/library/buildpack-deps:jammy
environment:
DEBIAN_FRONTEND: noninteractive
commands:
- apt-get update
- apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates
- ARCH=amd64 BUILD_DIR=build-amd64 bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
- ls -la dist
# - name: build-deb-amd64
# image: cache.coadcorp.com/library/buildpack-deps:jammy
# environment:
# DEBIAN_FRONTEND: noninteractive
# commands:
# - apt-get update
# - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates
# - ARCH=amd64 BUILD_DIR=build-amd64 bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
# - ls -la dist
- name: build-deb-armhf
image: cache.coadcorp.com/library/buildpack-deps:jammy

10
mkspecs/linux-arm64-g++/qmake.conf
View File

@@ -1,4 +1,12 @@
include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
exists(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf) {
include(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf)
} else: exists(/usr/share/qt5/mkspecs/linux-g++/qmake.conf) {
include(/usr/share/qt5/mkspecs/linux-g++/qmake.conf)
} else: exists($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf) {
include($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf)
} else {
include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
}
QMAKE_CC = aarch64-linux-gnu-gcc
QMAKE_CXX = aarch64-linux-gnu-g++

10
mkspecs/linux-armhf-g++/qmake.conf
View File

@@ -1,4 +1,12 @@
include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
exists(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf) {
include(/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf)
} else: exists(/usr/share/qt5/mkspecs/linux-g++/qmake.conf) {
include(/usr/share/qt5/mkspecs/linux-g++/qmake.conf)
} else: exists($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf) {
include($$[QT_HOST_DATA]/mkspecs/linux-g++/qmake.conf)
} else {
include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
}
QMAKE_CC = arm-linux-gnueabihf-gcc
QMAKE_CXX = arm-linux-gnueabihf-g++