From ee9281b458c86223aa3d0b7fb4c45df4829d8685 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Tue, 16 May 2023 06:58:45 +0200 Subject: [PATCH] qt5: install host tools in /usr/local/genode/tool/23.05 Issue #4868 --- repos/libports/lib/import/import-qt5_cmake.mk | 2 +- repos/libports/lib/import/import-qt5_qmake.mk | 2 +- tool/tool_chain_qt5 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/libports/lib/import/import-qt5_cmake.mk b/repos/libports/lib/import/import-qt5_cmake.mk index d9cd2e2bbd..15eddf6862 100644 --- a/repos/libports/lib/import/import-qt5_cmake.mk +++ b/repos/libports/lib/import/import-qt5_cmake.mk @@ -6,7 +6,7 @@ # QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) # -QT_TOOLS_DIR = /usr/local/genode/qt5/23.05 +QT_TOOLS_DIR = /usr/local/genode/tool/23.05 ifeq ($(filter-out $(SPECS),arm),) QT_PLATFORM = genode-arm-g++ diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk index bf64b5f70b..d5c039aa3b 100644 --- a/repos/libports/lib/import/import-qt5_qmake.mk +++ b/repos/libports/lib/import/import-qt5_qmake.mk @@ -6,7 +6,7 @@ # QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) # -QT_TOOLS_DIR = /usr/local/genode/qt5/23.05 +QT_TOOLS_DIR = /usr/local/genode/tool/23.05 QMAKE = $(QT_TOOLS_DIR)/bin/qmake ifeq ($(filter-out $(SPECS),arm),) diff --git a/tool/tool_chain_qt5 b/tool/tool_chain_qt5 index 8c3b3b343e..496fc57184 100755 --- a/tool/tool_chain_qt5 +++ b/tool/tool_chain_qt5 @@ -41,7 +41,7 @@ QTDECLARATIVE_DIR = $(CONTRIB_DIR)/src/lib/qtdeclarative QTTOOLS_DIR = $(CONTRIB_DIR)/src/lib/qttools TOOL_VERSION = 23.05 BUILD_DIR = $(GENODE_DIR)/build/tool/qt5/$(TOOL_VERSION) -DEFAULT_INSTALL_LOCATION = /usr/local/genode/qt5/$(TOOL_VERSION) +DEFAULT_INSTALL_LOCATION = /usr/local/genode/tool/$(TOOL_VERSION) INSTALL_LOCATION ?= $(DEFAULT_INSTALL_LOCATION) SUDO ?= sudo