qtifw: build native qmake and deps

src/cc.mk

@@ -7,3 +7,5 @@ $(PKG)_VERSION  := 1
 $(PKG)_DEPS     := gcc
 $(PKG)_OO_DEPS   = pkgconf $(MXE_REQS_PKGS)
 $(PKG)_TYPE     := meta
+$(PKG)_DEPS_$(BUILD) :=
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)

src/qtactiveqt.mk

@@ -10,6 +10,7 @@ $(PKG)_SUBDIR    = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtactiveqt,$(qtbase_URL))
 $(PKG)_DEPS     := cc qtbase
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 define $(PKG)_UPDATE
     echo $(qtbase_VERSION)

src/qtbase.mk

@@ -10,6 +10,8 @@ $(PKG)_SUBDIR   := $(PKG)-everywhere-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.qt.io/official_releases/qt/5.11/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib
+$(PKG)_DEPS_$(BUILD) :=
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- https://download.qt.io/official_releases/qt/5.8/ | \
@@ -112,3 +114,25 @@ endef
 
 $(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\
                       $($(PKG)_BUILD))
+
+define $(PKG)_BUILD_$(BUILD)
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        -prefix '$(PREFIX)/$(TARGET)/qt5' \
+        -static \
+        -release \
+        -opensource \
+        -confirm-license \
+        -no-dbus \
+        -no-{eventfd,glib,icu,inotify,openssl} \
+        -no-sql-{db2,ibase,mysql,oci,odbc,psql,sqlite,sqlite2,tds} \
+        -no-use-gold-linker \
+        -nomake examples \
+        -nomake tests \
+        -make tools \
+        -continue \
+        -verbose
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    rm -rf '$(PREFIX)/$(TARGET)/qt5'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
+    ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
+endef

src/qtdeclarative.mk

@@ -10,6 +10,7 @@ $(PKG)_SUBDIR    = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtdeclarative,$(qtbase_URL))
 $(PKG)_DEPS     := cc qtbase qtsvg qtxmlpatterns
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 define $(PKG)_UPDATE
     echo $(qtbase_VERSION)

src/qtifw.mk

@@ -9,12 +9,13 @@ $(PKG)_CHECKSUM := a4ecafc37086f96a833463214f873caac977199e64f0b1453aa49bdd6f24f
 $(PKG)_SUBDIR    = qt-installer-framework-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).zip
 $(PKG)_URL      := https://download.qt.io/official_releases/qt-installer-framework/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc qtwinextras
-$(PKG)_DEPS_$(BUILD) :=
-$(PKG)_TARGETS  := $(BUILD) i686-w64-mingw32.static.posix
+$(PKG)_DEPS     := cc qtbase qttools qtwinextras
+$(PKG)_DEPS_$(BUILD) := qtbase qttools
+# requires posix toolchain and only makes sense for static builds
+$(PKG)_TARGETS  := $(BUILD) $(foreach TGT,$(MXE_TARGETS),$(and $(findstring static,$(TGT)),$(findstring posix,$(TGT)),$(TGT)))
 
 define $(PKG)_BUILD_$(BUILD)
-    cd '$(1)' && qmake
+    cd '$(1)' && $(TARGET)-qmake-qt5
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(INSTALL) -m755 '$(1)/bin/binarycreator' '$(PREFIX)/bin/$(TARGET)-binarycreator'
     $(INSTALL) -m755 '$(1)/bin/repogen' '$(PREFIX)/bin/$(TARGET)-repogen'
@@ -27,4 +28,3 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j  1
     $(MAKE) -C '$(1)' -j 1 install
 endef
-

src/qtsvg.mk

@@ -10,6 +10,7 @@ $(PKG)_SUBDIR    = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtsvg,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtsvg,$(qtbase_URL))
 $(PKG)_DEPS     := cc qtbase
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 define $(PKG)_UPDATE
     echo $(qtbase_VERSION)

src/qttools.mk

@@ -10,6 +10,7 @@ $(PKG)_SUBDIR    = $(subst qtbase,qttools,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttools,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttools,$(qtbase_URL))
 $(PKG)_DEPS     := cc qtactiveqt qtbase qtdeclarative
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 $(PKG)_TEST_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/qttools-test
 
@@ -29,3 +30,9 @@ define $(PKG)_BUILD
     cp '$(1)'.test/mxe-cmake-qtuitools.exe \
         '$(PREFIX)/$(TARGET)/bin/test-qttools.exe'
 endef
+
+define $(PKG)_BUILD_$(BUILD)
+    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j 1 install
+endef

src/qtxmlpatterns.mk

@@ -10,6 +10,7 @@ $(PKG)_SUBDIR    = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))
 $(PKG)_DEPS     := cc qtbase
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
 define $(PKG)_UPDATE
     echo $(qtbase_VERSION)