Skip to content

Commit 586ad2c

Browse files
committed
Fix linux/debian/rules for building on Ubuntu 20.04
1 parent 535da26 commit 586ad2c

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

linux/debian/rules

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@ DEB_TARGET_GNU_TYPE := $(shell dpkg-architecture -qDEB_TARGET_GNU_TYPE)
55
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
66
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
77

8+
# DEB_BUILD_GNU_TYPE is the system running the build (this system)
9+
# DEB_HOST_GNU_TYPE is the system jamulus is being built for (the target)
10+
# DEB_TARGET_GNU_TYPE is only relevant when building cross-compilers
11+
$(info DEB_BUILD_GNU_TYPE=$(DEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE) DEB_TARGET_GNU_TYPE=$(DEB_TARGET_GNU_TYPE))
12+
813
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
914
QMAKE := qmake
1015
else
11-
QMAKE := "/usr/lib/$(DEB_BUILD_GNU_TYPE)/qt5/bin/qmake" -qtconf "/usr/lib/$(DEB_TARGET_GNU_TYPE)/qt5/qt.conf" -spec "/usr/lib/$(DEB_TARGET_GNU_TYPE)/qt5/mkspecs/$(DEB_TARGET_GNU_TYPE)-g++" LIBS+="-lstdc++ -lm"
16+
# For an unknown reason, when called from this makefile in Ubuntu 20.04,
17+
# qmake needs an option between qmake and -qtconf, else it gives an error.
18+
# We use -makefile, which is the default mode anyway, and this avoids the issue.
19+
QMAKE := qmake -makefile -qtconf "/usr/lib/$(DEB_HOST_GNU_TYPE)/qt5/qt.conf" -spec "/usr/lib/$(DEB_HOST_GNU_TYPE)/qt5/mkspecs/$(DEB_HOST_GNU_TYPE)-g++" LIBS+="-lstdc++ -lm"
1220
endif
1321

1422
%:

0 commit comments

Comments
 (0)