From 6d6474ba0e7dd6eabedf7ed17e48692f55eb5713 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Mon, 13 Mar 2017 15:46:41 +0100
Subject: [PATCH] qt5: improve port check

Fixes #2324
---
 repos/libports/lib/mk/qt5_gui.mk            | 2 ++
 repos/libports/lib/mk/qt5_jscore.mk         | 2 ++
 repos/libports/lib/mk/qt5_qtquick2plugin.mk | 2 ++
 repos/libports/lib/mk/qt5_v8.mk             | 2 ++
 repos/libports/lib/mk/qt5_webcore.mk        | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/repos/libports/lib/mk/qt5_gui.mk b/repos/libports/lib/mk/qt5_gui.mk
index 102cb6ad93..0c63b3f8a7 100644
--- a/repos/libports/lib/mk/qt5_gui.mk
+++ b/repos/libports/lib/mk/qt5_gui.mk
@@ -44,7 +44,9 @@ LIBS += qt5_core jpeg zlib libpng gallium
 # install fonts
 #
 
+ifneq ($(call select_from_ports,qt5),)
 all: $(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts
+endif
 
 $(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts:
 	$(VERBOSE)mkdir -p $@
diff --git a/repos/libports/lib/mk/qt5_jscore.mk b/repos/libports/lib/mk/qt5_jscore.mk
index aea6cc889b..08318c3ea3 100644
--- a/repos/libports/lib/mk/qt5_jscore.mk
+++ b/repos/libports/lib/mk/qt5_jscore.mk
@@ -18,7 +18,9 @@ CC_WARN =
 # that's why they can be quite long
 #
 
+ifneq ($(call select_from_ports,qt5),)
 all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag
+endif
 
 JAVASCRIPTCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/JavaScriptCore
 
diff --git a/repos/libports/lib/mk/qt5_qtquick2plugin.mk b/repos/libports/lib/mk/qt5_qtquick2plugin.mk
index a0c1bb986a..0c39d55514 100644
--- a/repos/libports/lib/mk/qt5_qtquick2plugin.mk
+++ b/repos/libports/lib/mk/qt5_qtquick2plugin.mk
@@ -26,7 +26,9 @@ $(QTQUICK_QMLDIR): $(QTQUICK_INSTALL_DIR)
 $(QTQUICK_PLUGIN): $(QTQUICK_INSTALL_DIR)
 	$(VERBOSE)ln -sf $(BUILD_BASE_DIR)/bin/$(QTQUICK_PLUGIN_NAME) $(QTQUICK_INSTALL_DIR)/$(QTQUICK_PLUGIN_NAME)
 
+ifneq ($(call select_from_ports,qt5),)
 all: $(QTQUICK_QMLDIR) $(QTQUICK_PLUGIN)
+endif
 
 #
 # unfortunately, these clean rules don't trigger
diff --git a/repos/libports/lib/mk/qt5_v8.mk b/repos/libports/lib/mk/qt5_v8.mk
index b96cc406ee..38f9519868 100644
--- a/repos/libports/lib/mk/qt5_v8.mk
+++ b/repos/libports/lib/mk/qt5_v8.mk
@@ -6,7 +6,9 @@ SHARED_LIB = yes
 # Generated files
 #
 
+ifneq ($(call select_from_ports,qt5),)
 all: $(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag
+endif
 
 V8_DIR = $(QT5_CONTRIB_DIR)/qtjsbackend/src/v8/../3rdparty/v8
 
diff --git a/repos/libports/lib/mk/qt5_webcore.mk b/repos/libports/lib/mk/qt5_webcore.mk
index 97def54cff..0e3b0fb6c1 100644
--- a/repos/libports/lib/mk/qt5_webcore.mk
+++ b/repos/libports/lib/mk/qt5_webcore.mk
@@ -23,7 +23,9 @@ QT_INCPATH := qtwebkit/Source/WebCore/dom
 # that's why they can be quite long
 #
 
+ifneq ($(call select_from_ports,qt5),)
 all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag
+endif
 
 # command names used by some of the extracted generator commands
 DEL_FILE := rm