From f7a4d92c2f58d9df14c3053c18e1d859f30da481 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Tue, 27 Aug 2024 21:45:08 +0200 Subject: [PATCH] fixup "qt5: avoid build of qt libs as target dep" (lib/mk -> src/qt5) Issue #5325 --- repos/libports/lib/import/import-qt5_cmake.mk | 17 +++++++++++------ repos/libports/lib/import/import-qt5_qmake.mk | 17 +++++++++++------ repos/libports/lib/mk/libqgenode.mk | 6 ------ .../recipes/src/libqgenodeviewwidget/content.mk | 2 +- repos/libports/recipes/src/qt5_base/content.mk | 2 +- .../recipes/src/qt5_declarative/content.mk | 2 +- .../recipes/src/qt5_graphicaleffects/content.mk | 2 +- .../recipes/src/qt5_quickcontrols/content.mk | 2 +- .../recipes/src/qt5_quickcontrols2/content.mk | 2 +- repos/libports/recipes/src/qt5_svg/content.mk | 2 +- .../recipes/src/qt5_virtualkeyboard/content.mk | 2 +- .../mk/qt5_base.mk => src/qt5/base/target.mk} | 6 +++--- .../qt5/declarative/target.mk} | 6 +++--- .../qt5/graphicaleffects/target.mk} | 6 +++--- .../qt5/qgenodeviewwidget/target.mk} | 4 ---- .../qt5/quickcontrols/target.mk} | 6 +++--- .../qt5/quickcontrols2/target.mk} | 6 +++--- .../mk/qt5_svg.mk => src/qt5/svg/target.mk} | 6 +++--- .../qt5/virtualkeyboard/target.mk} | 6 +++--- 19 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 repos/libports/lib/mk/libqgenode.mk rename repos/libports/{lib/mk/qt5_base.mk => src/qt5/base/target.mk} (97%) rename repos/libports/{lib/mk/qt5_declarative.mk => src/qt5/declarative/target.mk} (97%) rename repos/libports/{lib/mk/qt5_graphicaleffects.mk => src/qt5/graphicaleffects/target.mk} (96%) rename repos/libports/{lib/mk/libqgenodeviewwidget.mk => src/qt5/qgenodeviewwidget/target.mk} (87%) rename repos/libports/{lib/mk/qt5_quickcontrols.mk => src/qt5/quickcontrols/target.mk} (96%) rename repos/libports/{lib/mk/qt5_quickcontrols2.mk => src/qt5/quickcontrols2/target.mk} (97%) rename repos/libports/{lib/mk/qt5_svg.mk => src/qt5/svg/target.mk} (96%) rename repos/libports/{lib/mk/qt5_virtualkeyboard.mk => src/qt5/virtualkeyboard/target.mk} (97%) diff --git a/repos/libports/lib/import/import-qt5_cmake.mk b/repos/libports/lib/import/import-qt5_cmake.mk index ab3155367e..18984a9e8a 100644 --- a/repos/libports/lib/import/import-qt5_cmake.mk +++ b/repos/libports/lib/import/import-qt5_cmake.mk @@ -1,10 +1,12 @@ # # The following externally defined variables are evaluated: # -# CMAKE_LISTS_DIR: path to the CMakeLists.txt file -# CMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories -# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) -# QT5_COMPONENT_LIB_SO: if defined empty, disables linking with qt5_component.lib.so +# CMAKE_LISTS_DIR: path to the CMakeLists.txt file +# CMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories +# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) +# QT5_COMPONENT_LIB_SO: if defined empty, disables linking with qt5_component.lib.so +# QT5_TARGET_DEPS: default is 'build_with_cmake' +# QT5_EXTRA_TARGET_DEPS: additional target dependencies # include $(call select_from_repositories,lib/import/import-qt5.inc) @@ -147,8 +149,11 @@ endif BUILD_ARTIFACTS += $(notdir $(CMAKE_TARGET_BINARIES)) # -# build applications with CMake +# build with CMake by default # + +QT5_TARGET_DEPS ?= build_with_cmake + TARGET ?= $(CMAKE_LISTS_DIR).cmake_target .PHONY: $(TARGET) -$(TARGET): build_with_cmake $(QT5_EXTRA_TARGET_DEPS) +$(TARGET): $(QT5_TARGET_DEPS) $(QT5_EXTRA_TARGET_DEPS) diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk index 8caef176e3..fb1d6c485a 100644 --- a/repos/libports/lib/import/import-qt5_qmake.mk +++ b/repos/libports/lib/import/import-qt5_qmake.mk @@ -1,10 +1,12 @@ # # The following externally defined variables are evaluated: # -# QMAKE_PROJECT_FILE: path to the qmake project file (for applications with target.mk) -# QMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories -# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) -# QT5_COMPONENT_LIB_SO: if defined empty, disables linking with qt5_component.lib.so +# QMAKE_PROJECT_FILE: path to the qmake project file (for applications with target.mk) +# QMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories +# QT5_PORT_LIBS: Qt5 libraries used from port (for example libQt5Core) +# QT5_COMPONENT_LIB_SO: if defined empty, disables linking with qt5_component.lib.so +# QT5_TARGET_DEPS: default is 'build_with_qmake' +# QT5_EXTRA_TARGET_DEPS: additional target dependencies # include $(call select_from_repositories,lib/import/import-qt5.inc) @@ -160,8 +162,11 @@ build_with_qmake: qmake_prepared.tag qt5_so_files BUILD_ARTIFACTS += $(notdir $(QMAKE_TARGET_BINARIES)) # -# build applications with qmake +# build with qmake by default # + +QT5_TARGET_DEPS ?= build_with_qmake + TARGET ?= $(notdir $(QMAKE_PROJECT_FILE)).qmake_target .PHONY: $(TARGET) -$(TARGET): build_with_qmake $(QT5_EXTRA_TARGET_DEPS) +$(TARGET): $(QT5_TARGET_DEPS) $(QT5_EXTRA_TARGET_DEPS) diff --git a/repos/libports/lib/mk/libqgenode.mk b/repos/libports/lib/mk/libqgenode.mk deleted file mode 100644 index d8a67178fd..0000000000 --- a/repos/libports/lib/mk/libqgenode.mk +++ /dev/null @@ -1,6 +0,0 @@ -# -# This individual library description file is needed to get the abi -# library generated when building Qt5 packages. -# - -LIBS = qt5_base diff --git a/repos/libports/recipes/src/libqgenodeviewwidget/content.mk b/repos/libports/recipes/src/libqgenodeviewwidget/content.mk index 2d90418a74..d39583492f 100644 --- a/repos/libports/recipes/src/libqgenodeviewwidget/content.mk +++ b/repos/libports/recipes/src/libqgenodeviewwidget/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/libqgenodeviewwidget.mk \ +MIRROR_FROM_REP_DIR := src/qt5/qgenodeviewwidget/target.mk \ src/lib/qgenodeviewwidget content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/qt5_base/content.mk b/repos/libports/recipes/src/qt5_base/content.mk index 0bb6ccac65..dc518e4699 100644 --- a/repos/libports/recipes/src/qt5_base/content.mk +++ b/repos/libports/recipes/src/qt5_base/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_base.mk +MIRROR_FROM_REP_DIR := src/qt5/base/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/src/qt5_declarative/content.mk b/repos/libports/recipes/src/qt5_declarative/content.mk index f741863ff0..6b295d969e 100644 --- a/repos/libports/recipes/src/qt5_declarative/content.mk +++ b/repos/libports/recipes/src/qt5_declarative/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_declarative.mk +MIRROR_FROM_REP_DIR := src/qt5/declarative/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/src/qt5_graphicaleffects/content.mk b/repos/libports/recipes/src/qt5_graphicaleffects/content.mk index 45c9e4ab1a..3b2e919fb6 100644 --- a/repos/libports/recipes/src/qt5_graphicaleffects/content.mk +++ b/repos/libports/recipes/src/qt5_graphicaleffects/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_graphicaleffects.mk +MIRROR_FROM_REP_DIR := src/qt5/graphicaleffects/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/src/qt5_quickcontrols/content.mk b/repos/libports/recipes/src/qt5_quickcontrols/content.mk index 8cf841f090..7be1e765f7 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols/content.mk +++ b/repos/libports/recipes/src/qt5_quickcontrols/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols.mk +MIRROR_FROM_REP_DIR := src/qt5/quickcontrols/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk index 8b764635f1..4af79a3741 100644 --- a/repos/libports/recipes/src/qt5_quickcontrols2/content.mk +++ b/repos/libports/recipes/src/qt5_quickcontrols2/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_quickcontrols2.mk +MIRROR_FROM_REP_DIR := src/qt5/quickcontrols2/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/src/qt5_svg/content.mk b/repos/libports/recipes/src/qt5_svg/content.mk index 5eec4583c5..c0c5944a4f 100644 --- a/repos/libports/recipes/src/qt5_svg/content.mk +++ b/repos/libports/recipes/src/qt5_svg/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_svg.mk +MIRROR_FROM_REP_DIR := src/qt5/svg/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk b/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk index 3d77606630..b27bf1f6e2 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk +++ b/repos/libports/recipes/src/qt5_virtualkeyboard/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_virtualkeyboard.mk +MIRROR_FROM_REP_DIR := src/qt5/virtualkeyboard/target.mk content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/lib/mk/qt5_base.mk b/repos/libports/src/qt5/base/target.mk similarity index 97% rename from repos/libports/lib/mk/qt5_base.mk rename to repos/libports/src/qt5/base/target.mk index 37e85a35e2..03b829aee4 100644 --- a/repos/libports/lib/mk/qt5_base.mk +++ b/repos/libports/src/qt5/base/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_base.qmake_target + LIBS = qt5_qmake base ldso_so_support libc libm stdcxx qt5_component egl mesa qoost INSTALL_LIBS = lib/libQt5Core.lib.so \ @@ -82,6 +84,4 @@ build: qmake_prepared.tag build_dependencies/lib/ld.lib.so .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build diff --git a/repos/libports/lib/mk/qt5_declarative.mk b/repos/libports/src/qt5/declarative/target.mk similarity index 97% rename from repos/libports/lib/mk/qt5_declarative.mk rename to repos/libports/src/qt5/declarative/target.mk index 510031dadf..57cf62b770 100644 --- a/repos/libports/lib/mk/qt5_declarative.mk +++ b/repos/libports/src/qt5/declarative/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_declarative.qmake_target + QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Sql libQt5Test libQt5Widgets LIBS = qt5_qmake ldso_so_support libc libm mesa stdcxx @@ -80,6 +82,4 @@ build: qmake_prepared.tag qt5_so_files .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build diff --git a/repos/libports/lib/mk/qt5_graphicaleffects.mk b/repos/libports/src/qt5/graphicaleffects/target.mk similarity index 96% rename from repos/libports/lib/mk/qt5_graphicaleffects.mk rename to repos/libports/src/qt5/graphicaleffects/target.mk index dd13472cbe..d60b503911 100644 --- a/repos/libports/lib/mk/qt5_graphicaleffects.mk +++ b/repos/libports/src/qt5/graphicaleffects/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_graphicaleffects.qmake_target + QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick @@ -56,6 +58,4 @@ build: qmake_prepared.tag qt5_so_files .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build diff --git a/repos/libports/lib/mk/libqgenodeviewwidget.mk b/repos/libports/src/qt5/qgenodeviewwidget/target.mk similarity index 87% rename from repos/libports/lib/mk/libqgenodeviewwidget.mk rename to repos/libports/src/qt5/qgenodeviewwidget/target.mk index 879af19533..fd66e6fc17 100644 --- a/repos/libports/lib/mk/libqgenodeviewwidget.mk +++ b/repos/libports/src/qt5/qgenodeviewwidget/target.mk @@ -10,7 +10,3 @@ build_dependencies/include/qgenodeviewwidget: build_dependencies/include ln -snf $(call select_from_repositories,include/qgenodeviewwidget) $@ qmake_prepared.tag: build_dependencies/include/qgenodeviewwidget - -ifeq ($(called_from_lib_mk),yes) -all: build_with_qmake -endif diff --git a/repos/libports/lib/mk/qt5_quickcontrols.mk b/repos/libports/src/qt5/quickcontrols/target.mk similarity index 96% rename from repos/libports/lib/mk/qt5_quickcontrols.mk rename to repos/libports/src/qt5/quickcontrols/target.mk index c1870197a8..a9d887d08d 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols.mk +++ b/repos/libports/src/qt5/quickcontrols/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_quickcontrols.qmake_target + QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network libQt5Widgets QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick @@ -55,6 +57,4 @@ build: qmake_prepared.tag qt5_so_files .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build diff --git a/repos/libports/lib/mk/qt5_quickcontrols2.mk b/repos/libports/src/qt5/quickcontrols2/target.mk similarity index 97% rename from repos/libports/lib/mk/qt5_quickcontrols2.mk rename to repos/libports/src/qt5/quickcontrols2/target.mk index e5e041f53d..35934cc682 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols2.mk +++ b/repos/libports/src/qt5/quickcontrols2/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_quickcontrols2.qmake_target + QT5_PORT_LIBS += libQt5Core libQt5Gui libQt5Network libQt5Widgets QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick @@ -64,6 +66,4 @@ build: qmake_prepared.tag qt5_so_files .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build diff --git a/repos/libports/lib/mk/qt5_svg.mk b/repos/libports/src/qt5/svg/target.mk similarity index 96% rename from repos/libports/lib/mk/qt5_svg.mk rename to repos/libports/src/qt5/svg/target.mk index bd72747b31..5e318184ad 100644 --- a/repos/libports/lib/mk/qt5_svg.mk +++ b/repos/libports/src/qt5/svg/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_svg.qmake_target + QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Widgets LIBS = qt5_qmake libc libm mesa stdcxx @@ -55,6 +57,4 @@ build: qmake_prepared.tag qt5_so_files .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build diff --git a/repos/libports/lib/mk/qt5_virtualkeyboard.mk b/repos/libports/src/qt5/virtualkeyboard/target.mk similarity index 97% rename from repos/libports/lib/mk/qt5_virtualkeyboard.mk rename to repos/libports/src/qt5/virtualkeyboard/target.mk index 31f3632503..900c195d5d 100644 --- a/repos/libports/lib/mk/qt5_virtualkeyboard.mk +++ b/repos/libports/src/qt5/virtualkeyboard/target.mk @@ -1,3 +1,5 @@ +TARGET = qt5_virtualkeyboard.qmake_target + QT5_PORT_LIBS = libQt5Core libQt5Gui libQt5Network libQt5Widgets QT5_PORT_LIBS += libQt5Qml libQt5QmlModels libQt5Quick QT5_PORT_LIBS += libQt5Svg @@ -62,6 +64,4 @@ build: qmake_prepared.tag qt5_so_files .PHONY: build -ifeq ($(called_from_lib_mk),yes) -all: build -endif +QT5_TARGET_DEPS = build