qt5: improve port check

Fixes #2324
This commit is contained in:
Christian Prochaska 2017-03-13 15:46:41 +01:00 committed by Christian Helmuth
parent 637c418c96
commit 6d6474ba0e
5 changed files with 10 additions and 0 deletions

View File

@ -44,7 +44,9 @@ LIBS += qt5_core jpeg zlib libpng gallium
# install fonts # install fonts
# #
ifneq ($(call select_from_ports,qt5),)
all: $(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts all: $(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts
endif
$(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts: $(BUILD_BASE_DIR)/bin/qt5_fs/qt/lib/fonts:
$(VERBOSE)mkdir -p $@ $(VERBOSE)mkdir -p $@

View File

@ -18,7 +18,9 @@ CC_WARN =
# that's why they can be quite long # 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 all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag
endif
JAVASCRIPTCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/JavaScriptCore JAVASCRIPTCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/JavaScriptCore

View File

@ -26,7 +26,9 @@ $(QTQUICK_QMLDIR): $(QTQUICK_INSTALL_DIR)
$(QTQUICK_PLUGIN): $(QTQUICK_INSTALL_DIR) $(QTQUICK_PLUGIN): $(QTQUICK_INSTALL_DIR)
$(VERBOSE)ln -sf $(BUILD_BASE_DIR)/bin/$(QTQUICK_PLUGIN_NAME) $(QTQUICK_INSTALL_DIR)/$(QTQUICK_PLUGIN_NAME) $(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) all: $(QTQUICK_QMLDIR) $(QTQUICK_PLUGIN)
endif
# #
# unfortunately, these clean rules don't trigger # unfortunately, these clean rules don't trigger

View File

@ -6,7 +6,9 @@ SHARED_LIB = yes
# Generated files # Generated files
# #
ifneq ($(call select_from_ports,qt5),)
all: $(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag all: $(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag
endif
V8_DIR = $(QT5_CONTRIB_DIR)/qtjsbackend/src/v8/../3rdparty/v8 V8_DIR = $(QT5_CONTRIB_DIR)/qtjsbackend/src/v8/../3rdparty/v8

View File

@ -23,7 +23,9 @@ QT_INCPATH := qtwebkit/Source/WebCore/dom
# that's why they can be quite long # 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 all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag
endif
# command names used by some of the extracted generator commands # command names used by some of the extracted generator commands
DEL_FILE := rm DEL_FILE := rm