ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-22 20:15:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup "libports: add Qt6" (lib/mk -> src/qt6)

Browse Source 
Issue #5325
This commit is contained in:
Christian Prochaska 2024-08-27 15:29:40 +02:00 committed by Christian Helmuth
parent 7f52089eae
commit c426929979
10 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
repos/libports/lib/import/import-qt6_cmake.mk
View File

@ -1,10 +1,12 @@
# #
# The following externally defined variables are evaluated: # The following externally defined variables are evaluated:
# #
# CMAKE_LISTS_DIR: path to the CMakeLists.txt file # CMAKE_LISTS_DIR: path to the CMakeLists.txt file
# CMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories # CMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories
# QT6_PORT_LIBS: Qt6 libraries used from port (for example libQt6Core) # QT6_PORT_LIBS: Qt6 libraries used from port (for example libQt6Core)
# QT6_COMPONENT_LIB_SO: if defined empty, disables linking with qt6_component.lib.so # QT6_COMPONENT_LIB_SO: if defined empty, disables linking with qt6_component.lib.so
# QT6_TARGET_DEPS: default is 'build_with_cmake'
# QT6_EXTRA_TARGET_DEPS: additional target dependencies
# #
include $(call select_from_repositories,lib/import/import-qt6.inc) include $(call select_from_repositories,lib/import/import-qt6.inc)
@ -135,8 +137,11 @@ endif
BUILD_ARTIFACTS += $(notdir $(CMAKE_TARGET_BINARIES)) BUILD_ARTIFACTS += $(notdir $(CMAKE_TARGET_BINARIES))
# #
# build applications with CMake # build with CMake by default
# #
QT6_TARGET_DEPS ?= build_with_cmake
TARGET ?= $(CMAKE_LISTS_DIR).cmake_target TARGET ?= $(CMAKE_LISTS_DIR).cmake_target
.PHONY: $(TARGET) .PHONY: $(TARGET)
$(TARGET): build_with_cmake $(QT6_EXTRA_TARGET_DEPS) $(TARGET): $(QT6_TARGET_DEPS) $(QT6_EXTRA_TARGET_DEPS)

17
repos/libports/lib/import/import-qt6_qmake.mk
View File

@ -1,10 +1,12 @@
# #
# The following externally defined variables are evaluated: # The following externally defined variables are evaluated:
# #
# QMAKE_PROJECT_FILE: path to the qmake project file (for applications with target.mk) # 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 # QMAKE_TARGET_BINARIES binaries to be stripped and linked into 'bin' and 'debug' directories
# QT6_PORT_LIBS: Qt6 libraries used from port (for example libQt6Core) # QT6_PORT_LIBS: Qt6 libraries used from port (for example libQt6Core)
# QT6_COMPONENT_LIB_SO: if defined empty, disables linking with qt6_component.lib.so # QT6_COMPONENT_LIB_SO: if defined empty, disables linking with qt6_component.lib.so
# QT6_TARGET_DEPS: default is 'build_with_qmake'
# QT6_EXTRA_TARGET_DEPS: additional target dependencies
# #
include $(call select_from_repositories,lib/import/import-qt6.inc) include $(call select_from_repositories,lib/import/import-qt6.inc)
@ -169,8 +171,11 @@ build_with_qmake: qmake_prepared.tag qt6_so_files
BUILD_ARTIFACTS += $(notdir $(QMAKE_TARGET_BINARIES)) BUILD_ARTIFACTS += $(notdir $(QMAKE_TARGET_BINARIES))
# #
# build applications with qmake # build with qmake by default
# #
QT6_TARGET_DEPS ?= build_with_qmake
TARGET ?= $(notdir $(QMAKE_PROJECT_FILE)).qmake_target TARGET ?= $(notdir $(QMAKE_PROJECT_FILE)).qmake_target
.PHONY: $(TARGET) .PHONY: $(TARGET)
$(TARGET): build_with_qmake $(QT6_EXTRA_TARGET_DEPS) $(TARGET): $(QT6_TARGET_DEPS) $(QT6_EXTRA_TARGET_DEPS)

2
repos/libports/recipes/src/qt6_base/content.mk
View File

@ -1,4 +1,4 @@
MIRROR_FROM_REP_DIR := lib/mk/qt6_base.mk MIRROR_FROM_REP_DIR := src/qt6/base/target.mk
content: $(MIRROR_FROM_REP_DIR) content: $(MIRROR_FROM_REP_DIR)

2
repos/libports/recipes/src/qt6_declarative/content.mk
View File

@ -1,4 +1,4 @@
MIRROR_FROM_REP_DIR := lib/mk/qt6_declarative.mk MIRROR_FROM_REP_DIR := src/qt6/declarative/target.mk
content: $(MIRROR_FROM_REP_DIR) content: $(MIRROR_FROM_REP_DIR)

2
repos/libports/recipes/src/qt6_shadertools/content.mk
View File

@ -1,4 +1,4 @@
MIRROR_FROM_REP_DIR := lib/mk/qt6_shadertools.mk MIRROR_FROM_REP_DIR := src/qt6/shadertools/target.mk
content: $(MIRROR_FROM_REP_DIR) content: $(MIRROR_FROM_REP_DIR)

2
repos/libports/recipes/src/qt6_svg/content.mk
View File

@ -1,4 +1,4 @@
MIRROR_FROM_REP_DIR := lib/mk/qt6_svg.mk MIRROR_FROM_REP_DIR := src/qt6/svg/target.mk
content: $(MIRROR_FROM_REP_DIR) content: $(MIRROR_FROM_REP_DIR)

6
repos/libports/lib/mk/qt6_base.mk → repos/libports/src/qt6/base/target.mk
View File

@ -1,3 +1,5 @@
TARGET = qt6_base.cmake_target
LIBS = qt6_cmake ldso_so_support libc libm stdcxx qt6_component egl mesa base qoost LIBS = qt6_cmake ldso_so_support libc libm stdcxx qt6_component egl mesa base qoost
INSTALL_LIBS = lib/libQt6Concurrent.lib.so \ INSTALL_LIBS = lib/libQt6Concurrent.lib.so \
@ -113,6 +115,4 @@ build: cmake_prepared.tag
.PHONY: build .PHONY: build
ifeq ($(called_from_lib_mk),yes) QT6_TARGET_DEPS = build
all: build
endif

6
repos/libports/lib/mk/qt6_declarative.mk → repos/libports/src/qt6/declarative/target.mk
View File

@ -1,3 +1,5 @@
TARGET = qt6_declarative.cmake_target
QT6_PORT_LIBS = libQt6Core libQt6Gui libQt6OpenGL libQt6Network libQt6Sql libQt6Test libQt6Widgets QT6_PORT_LIBS = libQt6Core libQt6Gui libQt6OpenGL libQt6Network libQt6Sql libQt6Test libQt6Widgets
LIBS = qt6_cmake ldso_so_support libc libm mesa egl qt6_component stdcxx LIBS = qt6_cmake ldso_so_support libc libm mesa egl qt6_component stdcxx
@ -135,6 +137,4 @@ build: cmake_prepared.tag qt6_so_files
.PHONY: build .PHONY: build
ifeq ($(called_from_lib_mk),yes) QT6_TARGET_DEPS = build
all: build
endif

6
repos/libports/lib/mk/qt6_shadertools.mk → repos/libports/src/qt6/shadertools/target.mk
View File

@ -1,3 +1,5 @@
TARGET = qt6_shadertools.cmake_target
QT6_PORT_LIBS = libQt6Core libQt6Gui QT6_PORT_LIBS = libQt6Core libQt6Gui
LIBS = qt6_cmake ldso_so_support libc libm egl mesa qt6_component stdcxx LIBS = qt6_cmake ldso_so_support libc libm egl mesa qt6_component stdcxx
@ -66,6 +68,4 @@ build: cmake_prepared.tag qt6_so_files
.PHONY: build .PHONY: build
ifeq ($(called_from_lib_mk),yes) QT6_TARGET_DEPS = build
all: build
endif

6
repos/libports/lib/mk/qt6_svg.mk → repos/libports/src/qt6/svg/target.mk
View File

@ -1,3 +1,5 @@
TARGET = qt6_svg.cmake_target
QT6_PORT_LIBS = libQt6Core libQt6Gui libQt6Widgets QT6_PORT_LIBS = libQt6Core libQt6Gui libQt6Widgets
LIBS = qt6_cmake ldso_so_support libc libm egl mesa qt6_component stdcxx LIBS = qt6_cmake ldso_so_support libc libm egl mesa qt6_component stdcxx
@ -66,6 +68,4 @@ build: cmake_prepared.tag qt6_so_files
.PHONY: build .PHONY: build
ifeq ($(called_from_lib_mk),yes) QT6_TARGET_DEPS = build
all: build
endif