qt5: reduce external dependencies of host tools

Fixes #4868
This commit is contained in:
Christian Prochaska 2023-05-11 15:21:51 +02:00 committed by Christian Helmuth
parent 590cf78c0f
commit 03c23d299a
3 changed files with 7 additions and 4 deletions

View File

@ -6,7 +6,7 @@
# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core)
#
QT_TOOLS_DIR = /usr/local/genode/qt5/22.08
QT_TOOLS_DIR = /usr/local/genode/qt5/23.05
ifeq ($(filter-out $(SPECS),arm),)
QT_PLATFORM = genode-arm-g++

View File

@ -6,7 +6,7 @@
# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core)
#
QT_TOOLS_DIR = /usr/local/genode/qt5/22.08
QT_TOOLS_DIR = /usr/local/genode/qt5/23.05
QMAKE = $(QT_TOOLS_DIR)/bin/qmake
ifeq ($(filter-out $(SPECS),arm),)

View File

@ -39,7 +39,7 @@ CONTRIB_DIR = $(shell $(GENODE_DIR)/tool/ports/current qt5-host)
QTBASE_DIR = $(CONTRIB_DIR)/src/lib/qtbase
QTDECLARATIVE_DIR = $(CONTRIB_DIR)/src/lib/qtdeclarative
QTTOOLS_DIR = $(CONTRIB_DIR)/src/lib/qttools
TOOL_VERSION = 22.08
TOOL_VERSION = 23.05
BUILD_DIR = $(GENODE_DIR)/build/tool/qt5/$(TOOL_VERSION)
DEFAULT_INSTALL_LOCATION = /usr/local/genode/qt5/$(TOOL_VERSION)
INSTALL_LOCATION ?= $(DEFAULT_INSTALL_LOCATION)
@ -57,10 +57,13 @@ $(QMAKE): $(QTBASE_DIR)/configure
$(VERBOSE)cd $(BUILD_DIR)/qtbase && $(QTBASE_DIR)/configure \
-opensource \
-confirm-license \
-no-glib \
-no-iconv \
-no-zstd \
-no-icu \
-no-opengl \
-no-strip \
-no-zstd \
-qt-pcre \
-prefix $(INSTALL_LOCATION)
$(BUILD_DIR)/qtbase/src/Makefile: $(QMAKE)